From 285123d93e7e9966f7829ca46d768c74aeb5dfbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 15 Oct 2006 20:24:14 +0000 Subject: [PATCH] - 0.8.1pre2, optflags patch no longer needed. --- .cvsignore | 2 +- lirc-0.8.0-rpath64.patch | 22 ---------------------- lirc-optflags.patch | 18 ------------------ lirc.spec | 19 ++++++++++++------- sources | 2 +- 5 files changed, 14 insertions(+), 49 deletions(-) delete mode 100644 lirc-0.8.0-rpath64.patch delete mode 100644 lirc-optflags.patch diff --git a/.cvsignore b/.cvsignore index 8d80460..092791f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lirc-0.8.1pre1.tar.bz2 +lirc-0.8.1pre2.tar.bz2 diff --git a/lirc-0.8.0-rpath64.patch b/lirc-0.8.0-rpath64.patch deleted file mode 100644 index b0ecfeb..0000000 --- a/lirc-0.8.0-rpath64.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- lirc-0.8.0/configure~ 2006-01-21 11:03:45.000000000 +0200 -+++ lirc-0.8.0/configure 2006-02-14 22:19:00.000000000 +0200 -@@ -4282,7 +4282,7 @@ - shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" -+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - - case $host_os in ---- lirc-0.8.0/aclocal.m4~ 2006-01-21 11:03:43.000000000 +0200 -+++ lirc-0.8.0/aclocal.m4 2006-02-14 22:19:11.000000000 +0200 -@@ -2531,7 +2531,7 @@ - shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" -+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - - case $host_os in diff --git a/lirc-optflags.patch b/lirc-optflags.patch deleted file mode 100644 index 0f7707c..0000000 --- a/lirc-optflags.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lirc-0.7.2/configure.in.optflags 2005-08-14 17:53:43.000000000 +0300 -+++ lirc-0.7.2/configure.in 2005-08-14 17:54:18.000000000 +0300 -@@ -17,5 +17,5 @@ - AM_CONFIG_HEADER(config.h) - --CFLAGS="-O2 -g -Wall" -+CFLAGS="$CFLAGS -Wall" - - dnl Checks for programs. ---- lirc-0.7.2/configure.optflags 2005-08-14 17:53:50.000000000 +0300 -+++ lirc-0.7.2/configure 2005-08-14 17:54:07.000000000 +0300 -@@ -1076,5 +1076,5 @@ - - --CFLAGS="-O2 -g -Wall" -+CFLAGS="$CFLAGS -Wall" - - # Extract the first word of "gcc", so it can be a program name with args. diff --git a/lirc.spec b/lirc.spec index 0469adb..36031bd 100644 --- a/lirc.spec +++ b/lirc.spec @@ -1,6 +1,7 @@ # TODO: # - 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) # - 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,18 +16,16 @@ Name: lirc Version: 0.8.1 -Release: 0.2.pre1%{?dist} +Release: 0.2.pre2%{?dist} Summary: The Linux Infrared Remote Control package Group: System Environment/Daemons License: GPL URL: http://www.lirc.org/ #Source0: http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2 -Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre1.tar.bz2 +Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-optflags.patch -Patch1: %{name}-0.8.0-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{__perl} @@ -82,13 +81,16 @@ documentation and a collection of remote control configuration files. %prep -%setup -q -n %{name}-%{version}pre1 -%patch0 -p1 -%patch1 -p1 +%setup -q -n %{name}-%{version}pre2 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|/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 + 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 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib... %if ! %{with alsa} sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure* @@ -198,6 +200,9 @@ fi %changelog +* Sun Oct 15 2006 Ville Skyttä - 0.8.1-0.2.pre2 +- 0.8.1pre2, optflags patch no longer needed. + * Mon Aug 28 2006 Ville Skyttä - 0.8.1-0.2.pre1 - Rebuild. diff --git a/sources b/sources index d1f3d86..6cef89c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acb6340078bde9628f5ae848fec0583c lirc-0.8.1pre1.tar.bz2 +c8c1f5f692222050bcbafbf1ba6a1217 lirc-0.8.1pre2.tar.bz2