Hello community, here is the log from the commit of package xmoontool checked in at Fri Aug 11 15:54:58 CEST 2006. -------- --- xmoontool/xmoontool.changes 2006-01-25 21:43:16.000000000 +0100 +++ xmoontool/xmoontool.changes 2006-08-11 11:57:36.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 11 11:56:43 CEST 2006 - lmichnovic@suse.cz + +- adjusting paths to omit X11R6 when X.org is 7.x (*xorg7.patch) + +------------------------------------------------------------------- Old: ---- xmoontool-22sep94-y2kfix.dif xmoontool-22sep94.dif New: ---- xmoontool-22sep94-xorg7.patch xmoontool-22sep94-y2kfix.patch xmoontool-22sep94.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmoontool.spec ++++++ --- /var/tmp/diff_new_pack.zB7sNt/_old 2006-08-11 15:54:49.000000000 +0200 +++ /var/tmp/diff_new_pack.zB7sNt/_new 2006-08-11 15:54:49.000000000 +0200 @@ -5,27 +5,28 @@ # 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: xmoontool -BuildRequires: openmotif openmotif-devel update-desktop-files xorg-x11 +BuildRequires: openmotif openmotif-devel update-desktop-files xorg-x11 xorg-x11-devel License: distributable Group: Productivity/Scientific/Astronomy Provides: moontool Obsoletes: moontool Autoreqprov: on Version: 22.9.94 -Release: 751 +Release: 763 Summary: The Moon in focus URL: http://www.fourmilab.ch/earthview/vplanet.html Source: xmoontool-22sep94.tar.gz Source1: xmoontool.desktop -Patch: xmoontool-22sep94.dif -Patch1: xmoontool-22sep94-y2kfix.dif +Patch: xmoontool-22sep94.patch +Patch1: xmoontool-22sep94-y2kfix.patch Patch2: xmoontool-22.9.24-filepermissions.patch +Patch3: xmoontool-22sep94-xorg7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,9 +47,16 @@ %patch %patch1 %patch2 +%if "%(xft-config --prefix)" == "/usr" +%patch3 +%endif %build +%if "%(xft-config --prefix)" == "/usr" +make CFLAGS="$RPM_OPT_FLAGS -I/usr/include" XLIBDIR=/usr/%{_lib} +%else make CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" XLIBDIR=/usr/X11R6/%{_lib} +%endif %install make "DESTDIR=$RPM_BUILD_ROOT" install @@ -56,7 +64,7 @@ %files %defattr(-,root,root) -/usr/X11R6/bin/xmoontool +/usr/bin/xmoontool /usr/share/applications/*.desktop %doc /usr/share/man/man1/xmoontool.1.gz @@ -64,6 +72,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -n xmoontool +* Fri Aug 11 2006 - lmichnovic@suse.cz +- adjusting paths to omit X11R6 when X.org is 7.x (*xorg7.patch) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sat Jan 21 2006 - schwab@suse.de ++++++ xmoontool-22sep94-xorg7.patch ++++++ --- Makefile +++ Makefile @@ -1,7 +1,7 @@ CC=gcc CFLAGS=-m486 -O LIBS=-L$(XLIBDIR) -lXm -lXt -lX11 -lm -lSM -lICE -lXpm -lXext -lXp -INSTALLBIN=$(DESTDIR)/usr/X11R6/bin +INSTALLBIN=$(DESTDIR)/usr/bin INSTALLMAN=$(DESTDIR)/usr/share/man/man1 xmoontool: xmoontool.c color.pix moon_icon ++++++ xmoontool-22sep94-y2kfix.dif -> xmoontool-22sep94-y2kfix.patch ++++++ ++++++ xmoontool-22sep94.dif -> xmoontool-22sep94.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...