[svn] r4810 - in trunk/rpms: dkms-ipw3945 dkms-tiacx madwifi nvidia-x11-drv

Tue Oct 10 12:57:13 CEST 2006

Author: thias
Date: 2006-10-10 12:57:11 +0200 (Tue, 10 Oct 2006)
New Revision: 4810

Modified:
   trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
   trunk/rpms/dkms-tiacx/dkms-tiacx.spec
   trunk/rpms/madwifi/madwifi.spec
   trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
Log:
Fix all dkms packages for upgrades.


Modified: trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
===================================================================

--- trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec	2006-10-09 21:17:08 UTC (rev 4809)
+++ trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec	2006-10-10 10:57:11 UTC (rev 4810)
@@ -2,12 +2,10 @@
 # Authority: matthias
 # Dist: nodist
 
-%define dkms_name ipw3945
-
 Summary: Driver for Intel® PRO/Wirelss 3945 network adaptors
 Name: dkms-ipw3945
 Version: 1.1.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Kernel
 URL: http://ipw3945.sourceforge.net/
@@ -17,8 +15,8 @@
 BuildArch: noarch
 Requires: gcc
 Requires: ipw3945-firmware, ipw3945d
-Requires(pre): dkms
 Requires(post): dkms
+Requires(preun): dkms
 
 %description
 Driver (Linux kernel module) for Intel® PRO/Wirelss 3945 network adaptors.
@@ -35,15 +33,19 @@
 %install
 %{__rm} -rf %{buildroot}
 
+%define dkms_name ipw3945
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
 # Kernel module sources install for dkms
-%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 %{__cp} -a *.h *.c Makefile snapshot/ \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Configuration for dkms
-%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
-PACKAGE_VERSION=%{version}
+PACKAGE_VERSION=%{dkms_vers}
 BUILT_MODULE_NAME[0]=ipw3945
 DEST_MODULE_LOCATION[0]=/kernel/drivers/net/wireless
 AUTOINSTALL="YES"
@@ -56,23 +58,30 @@
 
 %post
 # Add to DKMS registry
-dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade
-# Build now
-dkms build -m %{dkms_name} -v %{version} -q
-dkms install -m %{dkms_name} -v %{version} -q
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
 
 %preun
 # Remove all versions from DKMS registry
-dkms remove -m %{dkms_name} -v %{version} --all -q --rpm_safe_upgrade
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
 
 
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES ISSUES LICENSE* README.ipw3945
-%{_usrsrc}/%{dkms_name}-%{version}/
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 
 %changelog
+* Tue Oct 10 2006 Matthias Saou <http://freshrpms.net/> 1.1.0-2
+- Add the rpm release to the dkms module version, to make updating the module
+  to a fixed same version work (--rpm_safe_upgrade doesn't work as advertised).
+- Force modules install so that the same version can be overwritten instead of
+  uninstalled by the old package's %%preun when updating.
+- Add build time quiet flag for the scriplets. Undefine to do verbose testing.
+
 * Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 1.1.0-1
 - Initial RPM release.
 

Modified: trunk/rpms/dkms-tiacx/dkms-tiacx.spec
===================================================================
--- trunk/rpms/dkms-tiacx/dkms-tiacx.spec	2006-10-09 21:17:08 UTC (rev 4809)
+++ trunk/rpms/dkms-tiacx/dkms-tiacx.spec	2006-10-10 10:57:11 UTC (rev 4810)
@@ -2,12 +2,10 @@
 # Authority: matthias
 # Dist: nodist
 
-%define dkms_name tiacx
-
 Summary: Driver for Texas Instruments' ACX100/ACX111 wireless network chips
 Name: dkms-tiacx
 Version: 0.4.7
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Kernel
 URL: http://www.kernel.org/pub/linux/kernel/people/linville/
@@ -17,8 +15,8 @@
 BuildArch: noarch
 Requires: gcc
 Requires: acx100-firmware, acx111-firmware
-Requires(pre): dkms
 Requires(post): dkms
+Requires(preun): dkms
 
 %description
 Driver (Linux kernel module) for network interface cards based on Texas
@@ -36,15 +34,19 @@
 %install
 %{__rm} -rf %{buildroot}
 
+%define dkms_name tiacx
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
 # Kernel module sources install for dkms
-%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 %{__cp} -a drivers/net/wireless/tiacx/{*.h,*.c,Makefile} \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Configuration for dkms
-%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
-PACKAGE_VERSION=%{version}
+PACKAGE_VERSION=%{dkms_vers}
 BUILT_MODULE_NAME[0]=acx-common
 BUILT_MODULE_NAME[1]=acx-pci
 BUILT_MODULE_NAME[2]=acx-usb
@@ -61,23 +63,30 @@
 
 %post
 # Add to DKMS registry
-dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade
-# Build now
-dkms build -m %{dkms_name} -v %{version} -q
-dkms install -m %{dkms_name} -v %{version} -q
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
 
 %preun
 # Remove all versions from DKMS registry
-dkms remove -m %{dkms_name} -v %{version} --all -q --rpm_safe_upgrade
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
 
 
 %files
 %defattr(-, root, root, 0755)
 %doc drivers/net/wireless/tiacx/README
-%{_usrsrc}/%{dkms_name}-%{version}/
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 
 %changelog
+* Tue Oct 10 2006 Matthias Saou <http://freshrpms.net/> 0.4.7-3
+- Add the rpm release to the dkms module version, to make updating the module
+  to a fixed same version work (--rpm_safe_upgrade doesn't work as advertised).
+- Force modules install so that the same version can be overwritten instead of
+  uninstalled by the old package's %%preun when updating.
+- Add build time quiet flag for the scriplets. Undefine to do verbose testing.
+
 * Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 0.4.7-2
 - Further patch Makefile to simplify the dkms.conf entries.
 

Modified: trunk/rpms/madwifi/madwifi.spec
===================================================================
--- trunk/rpms/madwifi/madwifi.spec	2006-10-09 21:17:08 UTC (rev 4809)
+++ trunk/rpms/madwifi/madwifi.spec	2006-10-10 10:57:11 UTC (rev 4810)
@@ -1,12 +1,10 @@
 # $Id$
 # Authority: matthias
 
-%define dkms_name madwifi
-
 Summary: Multiband Atheros Driver for Wireless Fidelity
 Name: madwifi
 Version: 0.9.2
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Kernel
 URL: http://madwifi.org/
@@ -14,8 +12,8 @@
 Patch0: madwifi-2.6.18-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gcc
-Requires(pre): dkms
 Requires(post): dkms
+Requires(preun): dkms
 Provides: dkms-madwifi = %{version}-%{release}
 
 %description
@@ -43,6 +41,10 @@
 %install
 %{__rm} -rf %{buildroot}
 
+%define dkms_name madwifi
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
 # Tools install
 %{__make} -C tools install \
     DESTDIR=%{buildroot} \
@@ -51,15 +53,15 @@
     MANDIR=%{_mandir}
 
 # Kernel module sources install for dkms
-%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 %{__cp} -a ath/ ath_rate/ hal/ include/ net80211/ scripts/ \
     BuildCaps.inc kernelversion.c Makefile Makefile.inc release.h \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Configuration for dkms
-%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
-PACKAGE_VERSION=%{version}
+PACKAGE_VERSION=%{dkms_vers}
 MAKE[0]="make modules KERNELPATH=${kernel_source_dir}"
 BUILT_MODULE_NAME[0]=ath_pci
 BUILT_MODULE_LOCATION[0]=ath
@@ -104,14 +106,14 @@
 
 %post
 # Add to DKMS registry
-dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade
-# Build now, so the current user can simply restart X
-dkms build -m %{dkms_name} -v %{version} -q
-dkms install -m %{dkms_name} -v %{version} -q
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
 
 %preun
 # Remove all versions from DKMS registry
-dkms remove -m %{dkms_name} -v %{version} --all -q --rpm_safe_upgrade
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
 
 
 %files
@@ -119,10 +121,17 @@
 %doc COPYRIGHT README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
 %{_bindir}/*
 %{_mandir}/man8/*
-%{_usrsrc}/%{dkms_name}-%{version}/
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 
 %changelog
+* Tue Oct 10 2006 Matthias Saou <http://freshrpms.net/> 0.9.2-2
+- Add the rpm release to the dkms module version, to make updating the module
+  to a fixed same version work (--rpm_safe_upgrade doesn't work as advertised).
+- Force modules install so that the same version can be overwritten instead of
+  uninstalled by the old package's %%preun when updating.
+- Add build time quiet flag for the scriplets. Undefine to do verbose testing.
+
 * 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.

Modified: trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
===================================================================
--- trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2006-10-09 21:17:08 UTC (rev 4809)
+++ trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2006-10-10 10:57:11 UTC (rev 4810)
@@ -4,7 +4,6 @@
 
 %define majmin          1.0
 %define relver          8774
-%define dkms_name       nvidia
 %define nvidialibdir    %{_libdir}/nvidia
 %define nvidialib32dir  %{_prefix}/lib/nvidia
 
@@ -13,7 +12,7 @@
 Summary: Proprietary NVIDIA hardware accelerated OpenGL driver
 Name: nvidia-x11-drv
 Version: %{majmin}.%{relver}
-Release: 2.1
+Release: 3
 License: Proprietary
 Group: User Interface/X Hardware Support
 URL: http://www.nvidia.com/object/unix.html
@@ -28,8 +27,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Required for proper dkms operation
 Requires: gcc
-Requires(pre): dkms
-Requires(post): dkms
+Requires(post): dkms, /sbin/ldconfig
+Requires(preun): dkms
 # Required by the NVIDIA run file
 Buildrequires: tar
 # Required for our build
@@ -64,11 +63,15 @@
 sh %{SOURCE1} --extract-only --target pkg/
 %endif
 
+%define dkms_name nvidia
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
 # Copy dkms conf file
-%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
-%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
-PACKAGE_VERSION=%{version}
+PACKAGE_VERSION=%{dkms_vers}
 MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_CC_MISMATCH=1"
 BUILT_MODULE_NAME[0]=nvidia
 DEST_MODULE_LOCATION[0]=/kernel/drivers/video/nvidia
@@ -76,12 +79,10 @@
 EOF
 
 # Install all the files, even the binary ones. Ick.
-%{__install} -p -m 0644 pkg/usr/src/nv/{makefile,Makefile.kbuild} \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
-%{__install} -p -m 0644 pkg/usr/src/nv/*.{c,h,o} \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+%{__install} -p -m 0644 pkg/usr/src/nv/{*.c,*.h,*.o,makefile,Makefile.kbuild} \
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 %{__install} -p -m 0755 pkg/usr/src/nv/*.sh \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Install libXvMCNVIDIA.*
 %{__mkdir_p} %{buildroot}/%{nvidialibdir}/
@@ -183,14 +184,14 @@
 %post
 /sbin/ldconfig
 # Add to DKMS registry
-dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade
-# Build now, so the current user can simply restart X
-dkms build -m %{dkms_name} -v %{version} -q
-dkms install -m %{dkms_name} -v %{version} -q
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
 
 %preun
 # Remove all versions from DKMS registry
-dkms remove -m %{dkms_name} -v %{version} --all -q --rpm_safe_upgrade
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
 
 %postun -p /sbin/ldconfig
 
@@ -200,7 +201,7 @@
 %doc pkg/LICENSE pkg/usr/share/doc/*
 # Kernel and dkms related bits
 %config %{_sysconfdir}/modprobe.d/nvidia
-%{_usrsrc}/%{dkms_name}-%{version}/
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 # fixme: use udev
 %attr(0600,root,root) %dev(c,195,0) /dev/nvidia0
 %attr(0600,root,root) %dev(c,195,1) /dev/nvidia1
@@ -243,6 +244,13 @@
 
 
 %changelog
+* Tue Oct 10 2006 Matthias Saou <http://freshrpms.net/> 1.0.8774-3
+- Add the rpm release to the dkms module version, to make updating the module
+  to a fixed same version work (--rpm_safe_upgrade doesn't work as advertised).
+- Force modules install so that the same version can be overwritten instead of
+  uninstalled by the old package's %%preun when updating.
+- Add build time quiet flag for the scriplets. Undefine to do verbose testing.
+
 * 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.

