SPECS: lirc.spec - suffix src package with alt kernel name (if pre...

hawk hawk at pld-linux.org
Wed Jan 23 18:56:37 CET 2008


Author: hawk                         Date: Wed Jan 23 17:56:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- suffix src package with alt kernel name (if present)
- disable userspace for alt_kernels
- _rel -> rel

---- Files affected:
SPECS:
   lirc.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.148 SPECS/lirc.spec:1.149
--- SPECS/lirc.spec:1.148	Mon Nov  5 19:41:49 2007
+++ SPECS/lirc.spec	Wed Jan 23 18:56:32 2008
@@ -16,6 +16,13 @@
 %undefine	with_dist_kernel
 %endif
 
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+
+%define		pname	lirc
+%define		rel	1
+
 #
 # main package
 #
@@ -24,29 +31,28 @@
 %define		no_install_post_strip 1
 Summary:	Linux Infrared Remote Control daemons
 Summary(pl.UTF-8):	Serwery do zdalnego sterowania Linuksem za pomocą podczerwieni
-Name:		lirc
+Name:		%{pname}%{_alt_kernel}
 Version:	0.8.2
-%define	_rel	1
-Release:	%{_rel}
+Release:	%{rel}
 License:	GPL
 Group:		Daemons
-Source0:	http://dl.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:	http://dl.sourceforge.net/lirc/%{pname}-%{version}.tar.bz2
 # Source0-md5:	83e7060a6693b81075c178d7e3b215af
 Source1:	http://lirc.sourceforge.net/remotes.tar.bz2
 # Source1-md5:	373ebacae6d9abff25e804bee172d142
-Source2:	%{name}d.sysconfig
-Source3:	%{name}d.init
-Source4:	%{name}md.init
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-tmp.patch
-Patch2:		%{name}-bttv-headers.patch
-Patch3:		%{name}-no-svgalib.patch
-Patch4:		%{name}-alpha.patch
-Patch5:		%{name}-i2c-2.8.x.patch
-Patch6:		%{name}-sparc.patch
-Patch7:		%{name}-remotes.patch
-Patch8:		%{name}-vserver.patch
-Patch9:		%{name}-kernelcc.patch
+Source2:	%{pname}d.sysconfig
+Source3:	%{pname}d.init
+Source4:	%{pname}md.init
+Patch0:		%{pname}-opt.patch
+Patch1:		%{pname}-tmp.patch
+Patch2:		%{pname}-bttv-headers.patch
+Patch3:		%{pname}-no-svgalib.patch
+Patch4:		%{pname}-alpha.patch
+Patch5:		%{pname}-i2c-2.8.x.patch
+Patch6:		%{pname}-sparc.patch
+Patch7:		%{pname}-remotes.patch
+Patch8:		%{pname}-vserver.patch
+Patch9:		%{pname}-kernelcc.patch
 URL:		http://www.lirc.org/
 #%{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 BuildRequires:	autoconf
@@ -61,7 +67,7 @@
 %{?with_svga:BuildRequires:	svgalib-devel}
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{pname}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -77,7 +83,7 @@
 Summary:	Lirc remotes database
 Summary(pl.UTF-8):	Baza pilotów obsługiwanych przez lirc
 Group:		Documentation
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 
 %description remotes
 This package contains configuration files for many remotes supported
@@ -91,7 +97,7 @@
 Summary:	Linux Infrared Remote Control - X11 utilities
 Summary(pl.UTF-8):	Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia X11
 Group:		X11/Applications
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{pname}-libs = %{version}-%{release}
 
 %description X11
 Linux Infrared Remote Control - X11 utilities.
@@ -103,7 +109,7 @@
 Summary:	Linux Infrared Remote Control - svgalib utilities
 Summary(pl.UTF-8):	Zdalne sterowanie Linuksem za pomocą podczerwieni - narzędzia svgalib
 Group:		Applications
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{pname}-libs = %{version}-%{release}
 
 %description svga
 Linux Infrared Remote Control - svgalib-based utilities.
@@ -130,7 +136,7 @@
 Summary:	Header files for LIRC development
 Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia programów z obsługą LIRC
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{pname}-libs = %{version}-%{release}
 
 %description devel
 This package provides the files necessary to develop LIRC-based
@@ -144,7 +150,7 @@
 Summary:	Static library for LIRC development
 Summary(pl.UTF-8):	Biblioteka statyczna LIRC
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{pname}-devel = %{version}-%{release}
 
 %description static
 The files necessary for development of statically-linked lirc-based
@@ -157,14 +163,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-atiusb
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-atiusb
@@ -183,14 +189,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-bt829
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-bt829
@@ -209,14 +215,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-cmdir
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-cmdir
@@ -235,14 +241,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-dev
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-dev
 Conflicts:	dev < 2.8.0-3
@@ -263,14 +269,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-gpio
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-gpio
 Conflicts:	dev < 2.8.0-3
@@ -291,14 +297,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-i2c
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-i2c
 Conflicts:	dev < 2.8.0-3
@@ -319,14 +325,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-igorplugusb
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-igorplugusb
 Conflicts:	dev < 2.8.0-3
@@ -347,14 +353,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-imon
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-imon
 Conflicts:	dev < 2.8.0-3
@@ -375,14 +381,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-it87
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-it87
@@ -401,14 +407,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-mceusb
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-mceusb
@@ -427,14 +433,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-sasem
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Conflicts:	dev < 2.8.0-3
 
 %description -n kernel%{_alt_kernel}-char-lirc-sasem
@@ -453,14 +459,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-serial
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 %{?with_dist_kernel:Requires:	setserial}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-serial
@@ -482,14 +488,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-streamzap
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-streamzap
 Conflicts:	dev < 2.8.0-3
@@ -510,14 +516,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-sir
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-sir
 Conflicts:	dev < 2.8.0-3
@@ -539,14 +545,14 @@
 %package -n kernel%{_alt_kernel}-char-lirc-parallel
 Summary:	Kernel modules for Linux Infrared Remote Control
 Summary(pl.UTF-8):	Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{pname} = %{version}-%{rel}
 Obsoletes:	lirc-modules
 Obsoletes:	lirc-modules-parallel
 Conflicts:	dev < 2.8.0-3
@@ -565,7 +571,7 @@
 Moduł lirc_parallel dla urządzeń podłączanych do portu równoległego.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{pname}-%{version} -a 1
 %patch0 -p1
 %patch1 -p1
 #%patch2 -p1
@@ -677,7 +683,7 @@
 cat>$RPM_BUILD_ROOT%{_sysconfdir}/lircd.conf<<END
 #
 # This is a placeholder for your configuration file.
-# See %{_docdir}/%{name}-%{version}/remotes for some examples.
+# See %{_docdir}/%{pname}-%{version}/remotes for some examples.
 #
 END
 cp -f $RPM_BUILD_ROOT%{_sysconfdir}/lirc{,m}d.conf
@@ -999,6 +1005,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2008-01-23 17:56:32  hawk
+- suffix src package with alt kernel name (if present)
+- disable userspace for alt_kernels
+- _rel -> rel
+
 Revision 1.148  2007-11-05 18:41:49  qboosh
 - dropped obsolete todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lirc.spec?r1=1.148&r2=1.149&f=u



More information about the pld-cvs-commit mailing list