Hello community, here is the log from the commit of package xmoontool for openSUSE:Factory checked in at 2014-11-07 09:06:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmoontool (Old) and /work/SRC/openSUSE:Factory/.xmoontool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmoontool" Changes: -------- --- /work/SRC/openSUSE:Factory/xmoontool/xmoontool.changes 2013-08-27 21:56:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmoontool.new/xmoontool.changes 2014-11-07 09:06:34.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Nov 1 21:47:00 UTC 2014 - [email protected] + +- Run spec cleaner +- Switch to individual pkgconfig() build requires + instead of using metapackage xorg-x11-devel +- moontool-22sep94-xorg7.patch extend to avoid overlinking + multiple unneeded libraries and fix implicit declarations. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmoontool.spec ++++++ --- /var/tmp/diff_new_pack.ySUPbA/_old 2014-11-07 09:06:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ySUPbA/_new 2014-11-07 09:06:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xmoontool (Version 22.9.94) +# spec file for package xmoontool # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xmoontool -BuildRequires: openmotif openmotif-devel update-desktop-files xorg-x11 xorg-x11-devel -License: SUSE-Public-Domain -Group: Productivity/Scientific/Astronomy -Provides: moontool -Obsoletes: moontool -AutoReqProv: on Version: 22.9.94 -Release: 970 +Release: 0 Summary: The Moon in focus +License: SUSE-Public-Domain +Group: Productivity/Scientific/Astronomy Url: http://www.fourmilab.ch/earthview/vplanet.html Source: xmoontool-22sep94.tar.gz Source1: xmoontool.desktop -Patch: xmoontool-22sep94.patch +Patch0: xmoontool-22sep94.patch Patch1: xmoontool-22sep94-y2kfix.patch Patch2: xmoontool-22.9.24-filepermissions.patch Patch3: xmoontool-22sep94-xorg7.patch +BuildRequires: openmotif-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xt) +Provides: moontool +Obsoletes: moontool BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,26 +45,23 @@ Hint: The option -c makes it also work with color ;-) %prep -%setup -n xmoontool-22sep94 -%patch +%setup -q -n xmoontool-22sep94 +%patch0 %patch1 %patch2 %patch3 %build -make CFLAGS="$RPM_OPT_FLAGS -I/usr/include" XLIBDIR=/usr/%{_lib} +make %{?_smp_mflags} CFLAGS="%{optflags} -I%{_prefix}/include" XLIBDIR=%{_libdir} %install -make "DESTDIR=$RPM_BUILD_ROOT" install -%suse_update_desktop_file -i %name Edutainment Astronomy +make "DESTDIR=%{buildroot}" install +%suse_update_desktop_file -i %{name} Edutainment Astronomy %files %defattr(-,root,root) -/usr/bin/xmoontool -/usr/share/applications/*.desktop -%doc /usr/share/man/man1/xmoontool.1.gz - -%clean -rm -rf $RPM_BUILD_ROOT +%{_bindir}/xmoontool +%{_datadir}/applications/*.desktop +%doc %{_mandir}/man1/xmoontool.1.gz %changelog ++++++ xmoontool-22sep94-xorg7.patch ++++++ --- /var/tmp/diff_new_pack.ySUPbA/_old 2014-11-07 09:06:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ySUPbA/_new 2014-11-07 09:06:35.000000000 +0100 @@ -1,11 +1,24 @@ ---- Makefile +--- Makefile.orig +++ Makefile @@ -1,7 +1,7 @@ CC=gcc - CFLAGS=-m486 -O - LIBS=-L$(XLIBDIR) -lXm -lXt -lX11 -lm -lSM -lICE -lXpm -lXext -lXp +-CFLAGS=-m486 -O +-LIBS=-L$(XLIBDIR) -lXm -lXt -lX11 -lm -lSM -lICE -lXpm -lXext -lXp -INSTALLBIN=$(DESTDIR)/usr/X11R6/bin ++CFLAGS += -D_GNU_SOURCE ++LIBS=-L$(XLIBDIR) -lXm -lXt -lX11 -lm +INSTALLBIN=$(DESTDIR)/usr/bin INSTALLMAN=$(DESTDIR)/usr/share/man/man1 xmoontool: xmoontool.c color.pix moon_icon +--- xmoontool.c.orig ++++ xmoontool.c +@@ -135,6 +135,8 @@ + */ + + #include <stdio.h> ++#include <unistd.h> ++#include <stdlib.h> + #include <time.h> + #include <X11/Intrinsic.h> + #include <X11/StringDefs.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
