Hello community, here is the log from the commit of package toshutils checked in at Fri Aug 18 14:02:48 CEST 2006. -------- --- arch/i386/toshutils/toshutils.changes 2006-01-25 21:44:45.000000000 +0100 +++ toshutils/toshutils.changes 2006-08-18 06:59:53.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 18 06:59:25 CEST 2006 - aj@suse.de + +- Fix build with new make and X11R7. + +------------------------------------------------------------------- New: ---- toshutils-2.0.1-make.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ toshutils.spec ++++++ --- /var/tmp/diff_new_pack.KtEbeE/_old 2006-08-18 14:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.KtEbeE/_new 2006-08-18 14:01:22.000000000 +0200 @@ -5,21 +5,22 @@ # 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://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: toshutils -BuildRequires: gtk1-compat-devel kernel-source update-desktop-files +BuildRequires: gtk1-compat-devel kernel-source update-desktop-files xorg-x11 License: GPL Group: System/Base Summary: Toshiba Linux Utilities Version: 2.0.1 -Release: 1138 +Release: 1150 Source: http://www.buzzard.org.uk/toshiba/toshutils-%{version}.tar.bz2 Patch: tuxtime-conf-manpage.diff Patch1: %{name}-%{version}.dif +Patch2: %{name}-%{version}-make.dif URL: http://www.buzzard.org.uk/toshiba/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: tosh_ut @@ -56,6 +57,7 @@ %setup -q %patch -p 1 %patch1 +%patch2 libtoolize --force autoreconf -if @@ -99,6 +101,8 @@ %{_bindir}/* %changelog -n toshutils +* Fri Aug 18 2006 - aj@suse.de +- Fix build with new make and X11R7. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Jan 19 2006 - jg@suse.de ++++++ toshutils-2.0.1-make.dif ++++++ --- src/Makefile.in +++ src/Makefile.in @@ -70,8 +70,8 @@ TUXCONFOBJS = tuxtime-conf.o sci.o hci.o alarms.o machine.o config.o misc.o BACKOBJS = tbacklight.o sci.o hci.o -OBJS = sci.o hci.o fan.o svpw.o hotkey.o tpasswd.o dispswitch.o machine.o\ - misc.o alarms.o config.o alarm.o wmtuxtime.o wmgeneral.o tuxtime-conf.o\ +OBJS = sci.o hci.o fan.o svpw.o hotkey.o tpasswd.o dispswitch.o machine.o \ + misc.o alarms.o config.o alarm.o wmtuxtime.o wmgeneral.o tuxtime-conf.o \ ownerstring.o tdocked.o thotswap.o tbacklight.o @@ -83,7 +83,7 @@ WALL = @WALL@ .c.o: - $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\"\ + $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\" \ -DXMESSAGE=\"$(XMESSAGE)\" -DWALL=\"$(WALL)\" -c $< @@ -96,7 +96,7 @@ $(LEX) -i parsetime.l wmtuxtime.o: wmtuxtime.c - $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\"\ + $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" \ -DBINDIR=\"$(BINDESTDIR)\" -DXMESSAGE=\"$(XMESSAGE)\" -c $< @@ -169,8 +169,8 @@ cp Makefile Makefile.bak sed '/^#----- dependences -----/q' Makefile.bak >Makefile echo >>Makefile - $(CC) $(CFLAGS) -M $(OBJS:.o=.c) |\ - sed 's/\/usr\/[^ ]* *//g;/^ \\$$/d' |\ + $(CC) $(CFLAGS) -M $(OBJS:.o=.c) | \ + sed 's/\/usr\/[^ ]* *//g;/^ \\$$/d' | \ grep -v '^ \\$$' >>Makefile #----- dependences ----- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org