Hello community, here is the log from the commit of package mwavem checked in at Mon Feb 12 02:01:25 CET 2007. -------- --- arch/i386/mwavem/mwavem.changes 2006-01-25 21:44:29.000000000 +0100 +++ /mounts/work_users/ro/STABLE/mwavem/mwavem.changes 2007-02-12 02:01:06.280767000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 12 02:01:01 CET 2007 - ro@suse.de + +- fix build as non-root + +------------------------------------------------------------------- New: ---- mwavem-buildroot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mwavem.spec ++++++ --- /var/tmp/diff_new_pack.C11331/_old 2007-02-12 02:01:15.000000000 +0100 +++ /var/tmp/diff_new_pack.C11331/_new 2007-02-12 02:01:15.000000000 +0100 @@ -1,25 +1,27 @@ # # spec file for package mwavem (Version 2.0) # -# Copyright (c) 2004 SUSE LINUX AG, 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: mwavem URL: http://www-124.ibm.com/acpmodem/ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Hardware/Modem PreReq: %fillup_prereq Summary: IBM ThinkPad 600 and 770 ACP Modem Driver Version: 2.0 -Release: 1 +Release: 37 Source0: ftp://www-126.ibm.com/pub/acpmodem/2.0/mwavem-2.0.tar.bz2 Source1: init.mwavem Patch0: mwavem.dif +Patch1: mwavem-buildroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,6 +38,7 @@ %prep %setup -q %patch -p1 +%patch1 %build autoreconf -f -i @@ -64,6 +67,7 @@ %{insserv_cleanup} %files +%defattr(-,root,root) %doc COPYING ChangeLog AUTHORS FAQ NEWS THANKS README %doc doc/mwave.* /usr/share/mwavem @@ -73,6 +77,8 @@ /usr/sbin/mwavem %changelog -n mwavem +* Mon Feb 12 2007 - ro@suse.de +- fix build as non-root * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Aug 18 2004 - mfabian@suse.de ++++++ mwavem-buildroot.patch ++++++ --- src/mwavem/Makefile.am +++ src/mwavem/Makefile.am @@ -10,26 +10,26 @@ -rm $(distdir)/modem.c install-exec-local: - if [ ! -c "/dev/modems/mwave" ]; then \ - mkdir -p /dev/modems; \ - mknod --mode=660 /dev/modems/mwave c 10 219; \ + if [ ! -c "$(DESTDIR)/dev/modems/mwave" ]; then \ + mkdir -p $(DESTDIR)/dev/modems; \ + mknod --mode=660 $(DESTDIR)/dev/modems/mwave c 10 219 || true ; \ fi - if [ -f "/etc/modules.conf" ]; then \ - cp -f /etc/modules.conf /etc/modules.conf~; \ - grep 'alias char-major-10-219 mwave' /etc/modules.conf || echo "alias char-major-10-219 mwave" >>/etc/modules.conf; \ - grep 'options mwave' /etc/modules.conf || echo "#options mwave mwave_uart_irq=3 mwave_uart_io=0x2f8 mwave_3780i_irq=10 mwave_3780i_io=0x130 mwave_debug=0x00" >>/etc/modules.conf; \ + if [ -f "$(DESTDIR)/etc/modules.conf" ]; then \ + cp -f $(DESTDIR)/etc/modules.conf $(DESTDIR)/etc/modules.conf~; \ + grep 'alias char-major-10-219 mwave' $(DESTDIR)/etc/modules.conf || echo "alias char-major-10-219 mwave" >>$(DESTDIR)/etc/modules.conf; \ + grep 'options mwave' $(DESTDIR)/etc/modules.conf || echo "#options mwave mwave_uart_irq=3 mwave_uart_io=0x2f8 mwave_3780i_irq=10 mwave_3780i_io=0x130 mwave_debug=0x00" >>$(DESTDIR)/etc/modules.conf; \ fi - if [ -f "/etc/modprobe.conf" ]; then \ - cp -f /etc/modprobe.conf /etc/modprobe.conf~; \ - grep 'alias char-major-10-219 mwave' /etc/modprobe.conf || echo "alias char-major-10-219 mwave" >>/etc/modprobe.conf; \ - grep 'options mwave' /etc/modprobe.conf || echo "#options mwave mwave_uart_irq=3 mwave_uart_io=0x2f8 mwave_3780i_irq=10 mwave_3780i_io=0x130 mwave_debug=0x00" >>/etc/modprobe.conf; \ + if [ -f "$(DESTDIR)/etc/modprobe.conf" ]; then \ + cp -f $(DESTDIR)/etc/modprobe.conf $(DESTDIR)/etc/modprobe.conf~; \ + grep 'alias char-major-10-219 mwave' $(DESTDIR)/etc/modprobe.conf || echo "alias char-major-10-219 mwave" >>$(DESTDIR)/etc/modprobe.conf; \ + grep 'options mwave' $(DESTDIR)/etc/modprobe.conf || echo "#options mwave mwave_uart_irq=3 mwave_uart_io=0x2f8 mwave_3780i_irq=10 mwave_3780i_io=0x130 mwave_debug=0x00" >>$(DESTDIR)/etc/modprobe.conf; \ fi -chmod 755 mwaved - -cp mwaved /etc/init.d/mwavem - -ln -f -s /etc/init.d/mwavem /etc/rc.d/rc5.d/S96mwavem - -ln -f -s /etc/init.d/mwavem /etc/rc.d/rc4.d/S96mwavem - -ln -f -s /etc/init.d/mwavem /etc/rc.d/rc3.d/S96mwavem - -ln -f -s /etc/init.d/mwavem /etc/rc.d/rc2.d/S96mwavem + -cp mwaved $(DESTDIR)/etc/init.d/mwavem + -ln -f -s /etc/init.d/mwavem $(DESTDIR)/etc/rc.d/rc5.d/S96mwavem + -ln -f -s /etc/init.d/mwavem $(DESTDIR)/etc/rc.d/rc4.d/S96mwavem + -ln -f -s /etc/init.d/mwavem $(DESTDIR)/etc/rc.d/rc3.d/S96mwavem + -ln -f -s /etc/init.d/mwavem $(DESTDIR)/etc/rc.d/rc2.d/S96mwavem uninstall-local: -rm -f /etc/rc.d/rc*.d/S*mwavem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org