Hello community, here is the log from the commit of package irda checked in at Sun Feb 11 18:57:57 CET 2007. -------- --- irda/irda.changes 2006-08-07 20:26:25.000000000 +0200 +++ /mounts/work_users/ro/STABLE/irda/irda.changes 2007-02-11 18:31:22.489509000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 11 18:30:44 CET 2007 - ro@suse.de + +- fix build as non-root +- link with libz when using libpci + +------------------------------------------------------------------- New: ---- irda-0.9.18-buildroot.diff irda-libpci_with_libz.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irda.spec ++++++ --- /var/tmp/diff_new_pack.gZ9962/_old 2007-02-11 18:57:32.000000000 +0100 +++ /var/tmp/diff_new_pack.gZ9962/_new 2007-02-11 18:57:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package irda (Version 0.9.18) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,9 +14,9 @@ URL: http://irda.sourceforge.net Summary: Necessary Tools for Using the Infrared Port Version: 0.9.18 -Release: 1 +Release: 37 Group: Hardware/Other -License: GPL, Other License(s), see package +License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build #Provides: #Requires: @@ -30,6 +30,8 @@ Patch4: irda-0.9.18-irdadump-flush-stdout.diff Patch5: irda-utils-0.9.18-fix-irkbd-makefile.diff Patch6: irda-utils-0.9.16-fix-off-by-one.diff +Patch7: irda-libpci_with_libz.diff +Patch8: irda-0.9.18-buildroot.diff Source1: 52-irda.rules Source2: irda-0.9.18.init Source3: irda-0.9.18.sysconfig @@ -72,6 +74,8 @@ %patch4 %patch5 %patch6 +%patch7 +%patch8 %build make INITD=%{_sysconfdir}/init.d ROOT="$RPM_BUILD_ROOT" all @@ -85,10 +89,11 @@ install -d -m 755 %{buildroot}/var/adm/fillup-templates make INITD=%{_sysconfdir}/init.d \ DOCDIR=%{_defaultdocdir}/irda \ - ROOT="$RPM_BUILD_ROOT" install + ROOT="$RPM_BUILD_ROOT" \ + MANDIR=%{_mandir} \ + install rm %{buildroot}/etc/sysconfig/irda %{buildroot}/etc/sysconfig/network-scripts/ifcfg-irlan0 rmdir %{buildroot}/etc/sysconfig/network-scripts -make MANDIR=%{buildroot}%{_mandir} -C man install #documentation, READMEs install -m 644 README %{buildroot}%{_docdir}/irda/ install -m 644 ethereal/README %{buildroot}%{_docdir}/irda/README.ethereal @@ -115,6 +120,7 @@ %{insserv_cleanup} %files +%defattr(-,root,root) %doc %{_docdir}/irda %{_sysconfdir}/init.d/irda /usr/sbin/* @@ -128,14 +134,17 @@ /etc/udev/rules.d/52-irda.rules %changelog -n irda +* Sun Feb 11 2007 - ro@suse.de +- fix build as non-root +- link with libz when using libpci * Mon Aug 07 2006 - seife@suse.de - update to 0.9.18, which includes: -- fixes and improvements to irdadump -- smcinit has been integrated -- support TOIM3232 dongle -- ability to run irattach in the foreground -- irdadump can read and write libpcap files -- new manpages + - fixes and improvements to irdadump + - smcinit has been integrated + - support TOIM3232 dongle + - ability to run irattach in the foreground + - irdadump can read and write libpcap files + - new manpages - include irnetd - package various README files - misc. packaging cleanups ++++++ irda-0.9.18-buildroot.diff ++++++ --- man/Makefile +++ man/Makefile @@ -41,12 +41,12 @@ install: man-pages $(prn_install) - $(ECMD)install -m 755 -d $(MAN4DIR) - $(ECMD)install -m 644 $(MANPAGES4) $(MAN4DIR)/ - $(ECMD)install -m 755 -d $(MAN7DIR) - $(ECMD)install -m 644 $(MANPAGES7) $(MAN7DIR)/ - $(ECMD)install -m 755 -d $(MAN8DIR) - $(ECMD)install -m 644 $(MANPAGES8) $(MAN8DIR)/ + $(ECMD)install -m 755 -d $(ROOT)/$(MAN4DIR) + $(ECMD)install -m 644 $(MANPAGES4) $(ROOT)/$(MAN4DIR)/ + $(ECMD)install -m 755 -d $(ROOT)/$(MAN7DIR) + $(ECMD)install -m 644 $(MANPAGES7) $(ROOT)/$(MAN7DIR)/ + $(ECMD)install -m 755 -d $(ROOT)/$(MAN8DIR) + $(ECMD)install -m 644 $(MANPAGES8) $(ROOT)/$(MAN8DIR)/ clean: ++++++ irda-libpci_with_libz.diff ++++++ --- smcinit/Makefile +++ smcinit/Makefile @@ -26,17 +26,17 @@ smcinit: smcinit.o $(prn_cc_o) - $(ECMD)$(CC) -o $@ $^ $(LIBS) -lpci + $(ECMD)$(CC) -o $@ $^ $(LIBS) -lpci -lz tosh1800-smcinit: tosh1800-smcinit.o $(prn_cc_o) - $(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci + $(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci -lz tosh2450-smcinit: tosh2450-smcinit.o $(prn_cc_o) - $(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci + $(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci -lz %o: %c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org