Mailinglist Archive: opensuse-commit (705 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package mtr
checked in at Mon Jul 24 18:25:18 CEST 2006.

--------
--- mtr/mtr.changes	2006-06-14 20:22:28.000000000 +0200
+++ mtr/mtr.changes	2006-07-24 16:29:42.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 24 16:02:25 CEST 2006 - lmichnovic@xxxxxxx
+
+- udjusted specfile to build also with new X.org 7.x 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mtr.spec ++++++
--- /var/tmp/diff_new_pack.gXjIci/_old	2006-07-24 18:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.gXjIci/_new	2006-07-24 18:25:12.000000000 +0200
@@ -14,7 +14,7 @@
 BuildRequires:  gtk1-compat-devel gtk2-devel update-desktop-files
 Summary:        Ping and Traceroute Network Diagnostic Tool
 Version:        0.71
-Release:        1
+Release:        2
 Group:          Productivity/Networking/Diagnostic
 License:        GPL
 URL:            http://www.BitWizard.nl/mtr
@@ -55,6 +55,31 @@
 --------
     Roger Wolff <R.E.Wolff@xxxxxxxxxxxx>
 
+%if 0%{?suse_version} <= 1010
+%define _xorg7libs X11R6/%_lib
+%define _xorg7libs32 X11R6/lib
+%define _xorg7bin X11R6/bin
+%define _xorg7mandir /usr/X11R6/man
+%define _xorg7pixmaps X11R6/include
+%define _xorg7libshare X11R6/lib/
+%define _xorg7xkb /etc/X11/xkb
+%define _xorg7termcap /usr/X11R6/lib/X11/etc
+%define _xorg7include
+%define _xorg7fonts /usr/X11R6/lib/X11/fonts
+%define _xorg7prefix /usr/X11R6
+%else
+%define _xorg7libs %_lib
+%define _xorg7libs32 lib
+%define _xorg7bin bin
+%define _xorg7mandir %_mandir
+%define _xorg7pixmaps include
+%define _xorg7libshare share
+%define _xorg7xkb /usr/share/X11/xkb
+%define _xorg7termcap /usr/lib/X11/etc
+%define _xorg7include /usr/include/xorg
+%define _xorg7fonts /usr/share/fonts
+%define _xorg7prefix /usr
+%endif
 %prep
 %setup -q 
 cp mtr.8 xmtr.8
@@ -70,7 +95,7 @@
 # GTK version
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
 	--enable-gtk2 \
-	--prefix=/usr/X11R6
+	--prefix=%{_xorg7prefix}
 make && mv mtr xmtr  
 make distclean
 #
@@ -82,13 +107,14 @@
 make
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/{X11R6/bin,sbin}
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT/usr/%{_xorg7bin}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 make DESTDIR=$RPM_BUILD_ROOT install
-install -m 4755 xmtr $RPM_BUILD_ROOT/usr/X11R6/bin
+install -m 4755 xmtr $RPM_BUILD_ROOT/usr/%{_xorg7bin}
 install -m 644 xmtr.8 $RPM_BUILD_ROOT/%{_mandir}/man8
-install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/include/X11/pixmaps/
-install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/X11R6/include/X11/pixmaps/xmtr_icon.xpm
+install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/
+install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/xmtr_icon.xpm
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/pixmaps/
 install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/xmtr_icon.xpm
 %suse_update_desktop_file -i xmtr Network Monitor
@@ -106,8 +132,8 @@
 %defattr(-,root,root)
 %doc AUTHORS COPYING FORMATS NEWS README SECURITY TODO
 %doc %{_mandir}/man8/xmtr.8*
-%attr(755,root,root) /usr/X11R6/bin/xmtr
-/usr/X11R6/include/X11/pixmaps
+%attr(755,root,root) /usr/%{_xorg7bin}/xmtr
+/usr/%{_xorg7pixmaps}/X11/pixmaps
 /usr/share/applications/*
 /usr/share/pixmaps/*
 
@@ -118,6 +144,8 @@
 %verify_permissions -e /usr/sbin/mtr
 
 %changelog -n mtr
+* Mon Jul 24 2006 - lmichnovic@xxxxxxx
+- udjusted specfile to build also with new X.org 7.x
 * Wed Jun 14 2006 - lmichnovic@xxxxxxx
 - Upgrade to version 0.71 which obsoletes res_mkquery.diff
 - some nice improvements.




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx