[svn] r4802 - in trunk/rpms: ipw3945d madwifi nvidia-x11-drv

[packagers at lists.rpmforge.net]

Author: thias
Date: 2006-10-09 15:59:40 +0200 (Mon, 09 Oct 2006)
New Revision: 4802

Modified:
   trunk/rpms/ipw3945d/ipw3945d.spec
   trunk/rpms/madwifi/madwifi.spec
   trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
Log:
Update ipw3945d to 1.7.22 and minor changes to dkms packages.


Modified: trunk/rpms/ipw3945d/ipw3945d.spec
===================================================================
--- trunk/rpms/ipw3945d/ipw3945d.spec	2006-10-09 13:29:40 UTC (rev 4801)
+++ trunk/rpms/ipw3945d/ipw3945d.spec	2006-10-09 13:59:40 UTC (rev 4802)
@@ -8,7 +8,7 @@
 
 Summary: Regulatory Daemon for Intel® PRO/Wireless 3945 network adaptors
 Name: ipw3945d
-Version: 1.7.18
+Version: 1.7.22
 Release: 1
 License: Distributable
 Group: System Environment/Kernel
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 1.7.22-1
+- Update to 1.7.22.
+
 * Thu Mar 30 2006 Matthias Saou <http://freshrpms.net/> 1.7.18-1
 - Initial RPM release.
 

Modified: trunk/rpms/madwifi/madwifi.spec
===================================================================
--- trunk/rpms/madwifi/madwifi.spec	2006-10-09 13:29:40 UTC (rev 4801)
+++ trunk/rpms/madwifi/madwifi.spec	2006-10-09 13:59:40 UTC (rev 4802)
@@ -6,7 +6,7 @@
 Summary: Multiband Atheros Driver for Wireless Fidelity
 Name: madwifi
 Version: 0.9.2
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Kernel
 URL: http://madwifi.org/
@@ -16,6 +16,7 @@
 Requires: gcc
 Requires(pre): dkms
 Requires(post): dkms
+Provides: dkms-madwifi = %{version}-%{release}
 
 %description
 MadWifi is short for Multiband Atheros Driver for Wireless Fidelity. It
@@ -50,13 +51,13 @@
     MANDIR=%{_mandir}
 
 # Kernel module sources install for dkms
-%{__mkdir_p} %{buildroot}%{_usrsrc}/madwifi-%{version}/
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
 %{__cp} -a ath/ ath_rate/ hal/ include/ net80211/ scripts/ \
     BuildCaps.inc kernelversion.c Makefile Makefile.inc release.h \
-    %{buildroot}%{_usrsrc}/madwifi-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
 
 # Configuration for dkms
-%{__cat} > %{buildroot}%{_usrsrc}/madwifi-%{version}/dkms.conf << 'EOF'
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
 PACKAGE_VERSION=%{version}
 MAKE[0]="make modules KERNELPATH=${kernel_source_dir}"
@@ -118,10 +119,14 @@
 %doc COPYRIGHT README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
 %{_bindir}/*
 %{_mandir}/man8/*
-%{_usrsrc}/madwifi-%{version}/
+%{_usrsrc}/%{dkms_name}-%{version}/
 
 
 %changelog
+* Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 0.9.2-1.1
+- Add dkms-madwifi provides.
+- Use %%{dkms_name} macro for the usr/src directory name.
+
 * Fri Oct  6 2006 Matthias Saou <http://freshrpms.net/> 0.9.2-1
 - Initial RPM release.
 

Modified: trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
===================================================================
--- trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2006-10-09 13:29:40 UTC (rev 4801)
+++ trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2006-10-09 13:59:40 UTC (rev 4802)
@@ -1,5 +1,6 @@
 # $Id$
 # Authority: matthias
+# Dist: nodist
 
 %define majmin          1.0
 %define relver          8774
@@ -12,7 +13,7 @@
 Summary: Proprietary NVIDIA hardware accelerated OpenGL driver
 Name: nvidia-x11-drv
 Version: %{majmin}.%{relver}
-Release: 2
+Release: 2.1
 License: Proprietary
 Group: User Interface/X Hardware Support
 URL: http://www.nvidia.com/object/unix.html
@@ -34,6 +35,7 @@
 # Required for our build
 BuildRequires: desktop-file-utils
 ExclusiveArch: i386 x86_64
+Provides: dkms-nvidia = %{version}-%{release}
 Conflicts: xorg-x11-drv-nvidia
 
 %description
@@ -63,8 +65,8 @@
 %endif
 
 # Copy dkms conf file
-%{__mkdir_p} %{buildroot}%{_usrsrc}/nvidia-%{version}/
-%{__cat} > %{buildroot}%{_usrsrc}/nvidia-%{version}/dkms.conf << 'EOF'
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
 PACKAGE_VERSION=%{version}
 MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_CC_MISMATCH=1"
@@ -75,11 +77,11 @@
 
 # Install all the files, even the binary ones. Ick.
 %{__install} -p -m 0644 pkg/usr/src/nv/{makefile,Makefile.kbuild} \
-    %{buildroot}%{_usrsrc}/nvidia-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
 %{__install} -p -m 0644 pkg/usr/src/nv/*.{c,h,o} \
-    %{buildroot}%{_usrsrc}/nvidia-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
 %{__install} -p -m 0755 pkg/usr/src/nv/*.sh \
-    %{buildroot}%{_usrsrc}/nvidia-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
 
 # Install libXvMCNVIDIA.*
 %{__mkdir_p} %{buildroot}/%{nvidialibdir}/
@@ -198,7 +200,7 @@
 %doc pkg/LICENSE pkg/usr/share/doc/*
 # Kernel and dkms related bits
 %config %{_sysconfdir}/modprobe.d/nvidia
-%{_usrsrc}/nvidia-%{version}/
+%{_usrsrc}/%{dkms_name}-%{version}/
 # fixme: use udev
 %attr(0600,root,root) %dev(c,195,0) /dev/nvidia0
 %attr(0600,root,root) %dev(c,195,1) /dev/nvidia1
@@ -241,6 +243,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 1.0.8774-2.1
+- Add dkms-nvidia provides.
+- Use %%{dkms_name} macro for the usr/src directory name.
+
 * Sat Oct  7 2006 Matthias Saou <http://freshrpms.net/> 1.0.8774-2
 - Include both x86 and x86_64 pkg.run files in the source rpm, so that the
   same can be used for both i386 and x86_64.