rpms/lirc/F-7 .cvsignore, 1.16, 1.17 lirc.init, 1.2, 1.3 lirc.spec, 1.22, 1.23 sources, 1.16, 1.17

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/lirc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7245

Modified Files:
	.cvsignore lirc.init lirc.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Jan 2007 13:58:28 -0000	1.16
+++ .cvsignore	28 Aug 2007 15:38:55 -0000	1.17
@@ -1 +1 @@
-lirc-0.8.1.tar.bz2
+lirc-0.8.2.tar.bz2


Index: lirc.init
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-7/lirc.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lirc.init	31 Aug 2005 16:02:04 -0000	1.2
+++ lirc.init	28 Aug 2007 15:38:55 -0000	1.3
@@ -10,6 +10,14 @@
 # config:      /etc/lircmd.conf
 # pidfile:     /var/run/lircd.pid
 
+### BEGIN INIT INFO
+# Provides: lirc
+# Should-Start: $syslog $network
+# Should-Stop: $syslog $network
+# Short-Description: Linux Infrared Remote Control daemon
+# Description: Enables remote control devices through LIRC.
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-7/lirc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lirc.spec	7 Jan 2007 13:58:28 -0000	1.22
+++ lirc.spec	28 Aug 2007 15:38:55 -0000	1.23
@@ -2,6 +2,7 @@
 # - caraca driver (req: caraca, http://caraca.sf.net/)
 # - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
 # - iguanaIR driver (req: http://iguanaworks.net/ir/usb/installation.shtml)
+#   -> would cause license change to "GPLv2"
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
@@ -15,14 +16,14 @@
 %bcond_without  x
 
 Name:           lirc
-Version:        0.8.1
-Release:        1%{?dist}
+Version:        0.8.2
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
-License:        GPL
+License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sf.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,10 +84,12 @@
 %setup -q
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
-sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
+sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
+    remotes/adstech/lircd.conf.usbx-707
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
 for f in remotes/chronos/lircd.conf.chronos \
-    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb ; do
+    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb \
+    NEWS ChangeLog AUTHORS contrib/lircrc ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
@@ -129,6 +132,8 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1*
 %endif
 
+install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -140,7 +145,7 @@
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
-rm -rf doc/Makefile* doc/.libs doc/man*
+rm -rf doc/Makefile* doc/.libs doc/man* doc/lirc.hwdb
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
@@ -183,6 +188,7 @@
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
+%{_datadir}/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
@@ -199,6 +205,19 @@
 
 
 %changelog
+* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-2
+- License: GPLv2+
+
+* Sun Jun 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-1
+- 0.8.2.
+
+* Wed Jun  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre3
+- 0.8.2pre3.
+- Fix up linefeeds and char encodings of more docs.
+
+* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre2
+- 0.8.2pre2.
+
 * Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
 - 0.8.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Jan 2007 13:58:28 -0000	1.16
+++ sources	28 Aug 2007 15:38:55 -0000	1.17
@@ -1 +1 @@
-3a42083fc6c54797351e52c77537c586  lirc-0.8.1.tar.bz2
+83e7060a6693b81075c178d7e3b215af  lirc-0.8.2.tar.bz2