Author: hawk Date: Mon Nov 12 12:43:58 2007 GMT
Module: SPECS Tag: Titanium
---- Log message:
- disable userspace for alt_kernels
- suffix src package with alt kernel if present
---- Files affected:
SPECS:
lirc.spec (1.148 -> 1.148.2.1)
---- Diffs:
================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.148 SPECS/lirc.spec:1.148.2.1
--- SPECS/lirc.spec:1.148 Mon Nov 5 19:41:49 2007
+++ SPECS/lirc.spec Mon Nov 12 13:43:53 2007
@@ -16,6 +16,12 @@
%undefine with_dist_kernel
%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
+%endif
+
+%define pname lirc
+
#
# main package
#
@@ -24,29 +30,29 @@
%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}
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
@@ -164,7 +170,7 @@
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
@@ -190,7 +196,7 @@
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
@@ -216,7 +222,7 @@
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
@@ -242,7 +248,7 @@
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
@@ -270,7 +276,7 @@
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
@@ -298,7 +304,7 @@
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
@@ -326,7 +332,7 @@
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
@@ -354,7 +360,7 @@
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
@@ -382,7 +388,7 @@
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
@@ -408,7 +414,7 @@
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
@@ -434,7 +440,7 @@
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
@@ -460,7 +466,7 @@
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
@@ -489,7 +495,7 @@
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
@@ -517,7 +523,7 @@
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
@@ -546,7 +552,7 @@
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
@@ -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,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.148.2.1 2007-11-12 12:43:53 hawk
+- disable userspace for alt_kernels
+- suffix src package with alt kernel if present
+
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.148.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
