Hello community, here is the log from the commit of package procmeter checked in at Thu Aug 17 02:18:28 CEST 2006. -------- --- procmeter/procmeter.changes 2006-02-23 12:14:02.000000000 +0100 +++ /work/users/ro/STABLE/procmeter/procmeter.changes 2006-08-17 02:14:39.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 02:14:30 CEST 2006 - ro@suse.de + +- move from /usr/X11R6 to /usr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procmeter.spec ++++++ --- /var/tmp/diff_new_pack.l1aWUX/_old 2006-08-17 02:18:09.000000000 +0200 +++ /var/tmp/diff_new_pack.l1aWUX/_new 2006-08-17 02:18:09.000000000 +0200 @@ -18,7 +18,7 @@ Obsoletes: procmtr Autoreqprov: on Version: 3.4a -Release: 178 +Release: 188 Summary: Display actual system parameters URL: http://www.gedanken.demon.co.uk/procmeter3/ Source: procmeter3-%{version}.tar.bz2 @@ -45,7 +45,7 @@ %patch2 %build -make XLIBDIR=/usr/X11R6/%{_lib} +make XLIBDIR=/usr/%{_lib} %install rm -rf $RPM_BUILD_ROOT @@ -59,12 +59,14 @@ %defattr(-,root,root) %doc ChangeLog ANNOUNCE LSM NEWS README /usr/share/applications/*.desktop -/usr/X11R6/bin/* -/usr/X11R6/lib/X11/ProcMeter3 -%doc /usr/X11R6/man/man1/* -%doc /usr/X11R6/man/man5/* +/usr/bin/* +/usr/lib/ProcMeter3 +%doc /usr/share/man/man1/* +%doc /usr/share/man/man5/* %changelog -n procmeter +* Thu Aug 17 2006 - ro@suse.de +- move from /usr/X11R6 to /usr * Thu Feb 23 2006 - pnemec@suse.cz - fixed ArrayOutOfBound #152045 * Wed Jan 25 2006 - mls@suse.de ++++++ procmeter3-3.4a.patch ++++++ --- /var/tmp/diff_new_pack.l1aWUX/_old 2006-08-17 02:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.l1aWUX/_new 2006-08-17 02:18:10.000000000 +0200 @@ -1,14 +1,22 @@ ---- Makefile 2003-01-17 19:48:39.000000000 +0100 -+++ Makefile 2003-07-02 13:16:11.000000000 +0200 -@@ -15,7 +15,7 @@ +--- Makefile ++++ Makefile +@@ -15,13 +15,13 @@ # Paths # INSTDIR - the default root directory for the package -INSTDIR=/usr/local -+INSTDIR=/usr/X11R6 ++INSTDIR=/usr # MANDIR - the directory to install man pages to - MANDIR=$(INSTDIR)/man +-MANDIR=$(INSTDIR)/man ++MANDIR=$(INSTDIR)/share/man + + # LIB_PATH - the root dir for library files +-LIB_PATH=$(INSTDIR)/lib/X11/ProcMeter3 ++LIB_PATH=$(INSTDIR)/lib/ProcMeter3 + + # MOD_PATH - the path modules are stored in + MOD_PATH=$(LIB_PATH)/modules @@ -36,7 +36,7 @@ # Program options @@ -54,14 +62,14 @@ - [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(MANDIR)/man1 - install -m 644 man/procmeterrc.5 $(MANDIR)/man5 - install -m 644 man/procmeter3_modules.1 $(MANDIR)/man1 -+ install -d $(DESTDIR)$(INSTDIR)/man/man1 -+ install -d $(DESTDIR)$(INSTDIR)/man/man5 -+ [ ! -f procmeter3 ] || install -m 644 man/procmeter3.1 $(DESTDIR)$(INSTDIR)/man/man1 -+ [ ! -f procmeter3-log ] || install -m 644 man/procmeter3-log.1 $(DESTDIR)$(INSTDIR)/man/man1 -+ [ ! -f procmeter3-lcd ] || install -m 644 man/procmeter3-lcd.1 $(DESTDIR)$(INSTDIR)/man/man1 -+ [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(DESTDIR)$(INSTDIR)/man/man1 -+ install -m 644 man/procmeterrc.5 $(DESTDIR)$(INSTDIR)/man/man5 -+ install -m 644 man/procmeter3_modules.1 $(DESTDIR)$(INSTDIR)/man/man1 ++ install -d $(DESTDIR)$(MANDIR)/man1 ++ install -d $(DESTDIR)$(MANDIR)/man5 ++ [ ! -f procmeter3 ] || install -m 644 man/procmeter3.1 $(DESTDIR)$(MANDIR)/man1 ++ [ ! -f procmeter3-log ] || install -m 644 man/procmeter3-log.1 $(DESTDIR)$(MANDIR)/man1 ++ [ ! -f procmeter3-lcd ] || install -m 644 man/procmeter3-lcd.1 $(DESTDIR)$(MANDIR)/man1 ++ [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(DESTDIR)$(MANDIR)/man1 ++ install -m 644 man/procmeterrc.5 $(DESTDIR)$(MANDIR)/man5 ++ install -m 644 man/procmeter3_modules.1 $(DESTDIR)$(MANDIR)/man1 # - [ ! -f $(RC_PATH)/.procmeterrc ] || mv $(RC_PATH)/.procmeterrc $(RC_PATH)/procmeterrc - @[ ! -f $(RC_PATH)/procmeterrc ] || (echo "" ; echo "*** The $(RC_PATH)/procmeterrc file has not been installed (it already exists)." ; echo "") @@ -76,17 +84,19 @@ - install -m 644 procmeter.h $(LIB_PATH)/include + install -d $(DESTDIR)$(LIB_PATH)/include + install -m 644 procmeter.h $(DESTDIR)$(LIB_PATH)/include ---- modules/Makefile 2002-06-16 16:18:33.000000000 +0200 -+++ modules/Makefile 2003-07-02 13:01:24.000000000 +0200 -@@ -14,7 +14,7 @@ +--- modules/Makefile ++++ modules/Makefile +@@ -14,8 +14,8 @@ # Paths (overridden by main Makefile) -INSTDIR=/usr/local -+INSTDIR=/usr/X11R6 - LIB_PATH=$(INSTDIR)/lib/X11/ProcMeter3 +-LIB_PATH=$(INSTDIR)/lib/X11/ProcMeter3 ++INSTDIR=/usr ++LIB_PATH=$(INSTDIR)/lib/ProcMeter3 MOD_PATH=$(LIB_PATH)/modules + # Programs @@ -25,7 +25,7 @@ # Program options (overridden by main Makefile) @@ -114,9 +124,19 @@ + install -m 644 template.c $(DESTDIR)$(LIB_PATH)/example + + -diff -ur procmeter3-3.4a/xaw/Makefile procmeter.orig/xaw/Makefile ---- xaw/Makefile 2002-06-04 15:22:56.000000000 +0200 -+++ xaw/Makefile 2003-07-02 13:01:24.000000000 +0200 +--- procmeterp.h ++++ procmeterp.h +@@ -29,7 +29,7 @@ + #endif + + #ifndef LIB_PATH +-#define LIB_PATH INSTDIR "/lib/X11/ProcMeter3" ++#define LIB_PATH INSTDIR "/lib/ProcMeter3" + #endif + #ifndef MOD_PATH + #define MOD_PATH LIB_PATH "/modules" +--- xaw/Makefile ++++ xaw/Makefile @@ -23,7 +23,7 @@ LDFLAGS= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org