- rebuild for kernel-3.7.10-4

[packages/lirc.git] / lirc.spec

diff --git a/lirc.spec b/lirc.spec
index ef4d13aeebcfd484b8676435b4f536d2518622d2..f12325ae2b078e51c52e6c634aa30618c24cd2a6 100644 (file)
--- a/lirc.spec
+++ b/lirc.spec
@@ -3,6 +3,7 @@
 # - try to make it use builder_kernel_modules and install_kernel_modules; I couldn't make it
 # - build is running kernel arch dependent, try to get rid of this
 # - libcaraca_client (http://caraca.sourceforge.net/) - no releases yet
+# - create modprobe alias files instead of reminding in post scriptlets
 #
 # Conditional build:
 %bcond_without dist_kernel     # without sources of distribution kernel
@@ -20,7 +21,7 @@
 %endif
 
 %define                pname   lirc
-%define                rel     73
+%define                rel     82
 
 #
 # main package
@@ -59,6 +60,7 @@ Patch4:               %{pname}-sparc.patch
 Patch5:                %{pname}-remotes.patch
 Patch6:                %{pname}-kernelcc.patch
 Patch7:                format-security.patch
+Patch8:                %{pname}-am.patch
 URL:           http://www.lirc.org/
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf >= 2.50
@@ -188,7 +190,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Conflicts:     dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-atiusb
@@ -214,7 +216,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Conflicts:     dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-bt829
@@ -240,7 +242,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-dev
 Conflicts:     dev < 2.8.0-3
@@ -268,7 +270,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Conflicts:     dev < 2.8.0-3
 
@@ -295,7 +297,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-gpio
 Conflicts:     dev < 2.8.0-3
@@ -323,7 +325,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-i2c
 Conflicts:     dev < 2.8.0-3
@@ -351,7 +353,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-igorplugusb
 Conflicts:     dev < 2.8.0-3
@@ -379,7 +381,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-imon
 Conflicts:     dev < 2.8.0-3
@@ -407,7 +409,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Conflicts:     dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-sasem
@@ -433,7 +435,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 %{?with_dist_kernel:Requires:  setserial}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-serial
@@ -462,7 +464,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-sir
 Conflicts:     dev < 2.8.0-3
@@ -490,7 +492,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-ttusbir
 Conflicts:     dev < 2.8.0-3
@@ -517,7 +519,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Conflicts:     dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-wpc87691
@@ -542,7 +544,7 @@ Group:              Base/Kernel
 Requires(postun):      %releq_kernel
 %endif
 Requires(post,postun): /sbin/depmod
-Requires:      %{pname} = %{version}-%{rel}
+Requires:      %{pname} = %{version}
 Obsoletes:     lirc-modules
 Obsoletes:     lirc-modules-parallel
 Conflicts:     dev < 2.8.0-3
@@ -572,6 +574,7 @@ Moduł lirc_parallel dla urządzeń podłączanych do portu równoległego.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 echo '#' > drivers/Makefile.am
@@ -631,7 +634,7 @@ rm -rf $RPM_BUILD_ROOT
 drivers=%{drivers}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 for drv in $drivers; do
-       install -p drivers/$drv/$drv.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
+       %install_kernel_modules -m drivers/$drv/$drv -d misc
 done
 %endif
 
@@ -673,8 +676,7 @@ rm -rf $RPM_BUILD_ROOT
 %service lircmd restart
 
 echo "If you are using a kernel-module-based driver, don't forget to"
-echo "install the kernel%{_alt_kernel}-char-lirc-<your_driver> or"
-echo "kernel%{_alt_kernel}-smp-char-lirc-<your_driver> package."
+echo "install the kernel%{_alt_kernel}-char-lirc-<your_driver> package."
 
 %preun
 if [ "$1" = "0" ]; then
@@ -695,8 +697,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-atiusb
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_atiusb' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_atiusb' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-atiusb
@@ -705,8 +706,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-bt829
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_bt829' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_bt829' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-bt829
@@ -727,8 +727,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-gpio
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_gpio' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_gpio' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-gpio
@@ -737,8 +736,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-i2c
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_i2c' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_i2c' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-i2c
@@ -747,8 +745,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-igorplugusb
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_igorplugusb' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_igorplugusb' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-igorplugusb
@@ -757,8 +754,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-imon
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_imon' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_imon' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-imon
@@ -767,8 +763,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-sasem
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_sasem' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_sasem' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-sasem
@@ -777,8 +772,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-serial
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_serial' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_serial' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-serial
@@ -787,8 +781,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-parallel
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_parallel' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_parallel' modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-parallel
@@ -797,8 +790,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-sir
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_sir' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_sir' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-sir
@@ -807,8 +799,7 @@ fi
 %post  -n kernel%{_alt_kernel}-char-lirc-ttusbir
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_ttusbir' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_ttusbir' to modprobe config"
 fi
 
 %postun        -n kernel%{_alt_kernel}-char-lirc-ttusbir
@@ -817,8 +808,7 @@ fi
 %post   -n kernel%{_alt_kernel}-char-lirc-wpc87691
 %depmod %{_kernel_ver}
 if [ "$1" = "1" ]; then
-       echo "Don't forget to add an 'alias lirc lirc_wpc87691' line"
-       echo "to your /etc/modules.conf."
+       echo "Don't forget to add an 'alias lirc lirc_wpc87691' to modprobe config"
 fi
 
 %postun -n kernel%{_alt_kernel}-char-lirc-wpc87691