Hello community,
here is the log from the commit of package fvwm2
checked in at Mon Aug 7 11:32:31 CEST 2006.
--------
--- fvwm2/fvwm2.changes 2006-07-03 17:08:27.000000000 +0200
+++ fvwm2/fvwm2.changes 2006-08-06 22:21:31.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Aug 6 22:18:50 CEST 2006 - pnemec@suse.cz
+
+- major change in specfile instalation and file section to build
+ with Xorg 7
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fvwm2.spec ++++++
--- /var/tmp/diff_new_pack.MJDuP4/_old 2006-08-07 11:31:48.000000000 +0200
+++ /var/tmp/diff_new_pack.MJDuP4/_new 2006-08-07 11:31:48.000000000 +0200
@@ -18,7 +18,7 @@
Obsoletes: fvwm xpmroot
Autoreqprov: on
Version: 2.5.16
-Release: 3
+Release: 4
Summary: Improved Version of FVWM Window Manager
URL: http://www.fvwm.org
Source0: fvwm-%{version}.tar.bz2
@@ -44,6 +44,22 @@
--------
The fvwm developers
+%define kermit seyon-kermit-1.0
+%if "%(xft-config --prefix)" == "/usr"
+%define _xorg7libs %_lib
+%define _xorg7bin bin
+%define _xorg7libs32 lib
+%define _xorg7libshare share
+%define _xorg7prefix /usr
+%define _xorg7mandir %_mandir
+%else
+%define _xorg7libs X11R6/%_lib
+%define _xorg7bin X11R6/bin
+%define _xorg7libshare X11R6/lib
+%define _xorg7libs32 X11R6/lib
+%define _xorg7prefix /usr/X11R6
+%define _xorg7mandir /usr/X11R6/man
+%endif
%prep
%setup -q -n fvwm-%{version}
%patch0
@@ -58,24 +74,27 @@
%{?suse_update_config:%{suse_update_config -f}}
autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-./configure --prefix=/usr/X11R6 \
+./configure \
+ --prefix=%{_xorg7prefix} \
+ --bindir=%{_prefix}/%{_xorg7bin} \
--sysconfdir=/etc/X11/fvwm2 \
- --libexecdir=\${prefix}/lib/X11/fvwm2 \
- --mandir=\${prefix}/man
+ --libexecdir=%{_xorg7prefix}/lib/X11/fvwm2 \
+ --mandir=%{_xorg7mandir}
make
%install
-make prefix=$RPM_BUILD_ROOT/usr/X11R6 \
- sysconfdir=$RPM_BUILD_ROOT/etc/X11/fvwm2 \
- install
+make DESTDIR=$RPM_BUILD_ROOT install
+#make prefix=$RPM_BUILD_ROOT%{_xorg7prefix} \
+# sysconfdir=$RPM_BUILD_ROOT/etc/X11/fvwm2 \
+# install
#
# default config
install -d -m 755 $RPM_BUILD_ROOT/etc/X11/fvwm2
install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc
#
# some extra utils
-install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/utils
-install utils/quantize_pixmaps $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/utils
+install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
+install utils/quantize_pixmaps $RPM_BUILD_ROOT/%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
#
# documentation for modules
install -d -m 755 docu-module
@@ -90,8 +109,9 @@
done
#
# icons
-install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/pixmaps
-install -m 644 icons/* $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/pixmaps
+install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps
+install -m 644 icons/* $RPM_BUILD_ROOT/%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps
+#
# install kdm/gdm entry
install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/
install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/xsessions/
@@ -105,16 +125,26 @@
%doc AUTHORS COPYING ChangeLog NEWS docs sample.fvwmrc docu-module/*
%dir /etc/X11/fvwm2
%config /etc/X11/fvwm2/system.fvwm2rc
-/usr/X11R6/bin/*
-/usr/X11R6/lib/X11/fvwm2
-/usr/X11R6/share/fvwm
-%dir /usr/X11R6/share/locale/*
-%dir /usr/X11R6/share/locale/*/*
-/usr/X11R6/share/locale/*/*/*.mo
-%doc /usr/X11R6/man/man1/*
-/usr/share/xsessions
+%{_prefix}/%{_xorg7bin}/*
+%{_prefix}/%{_xorg7libs32}/X11/fvwm2/*
+%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps/*
+%{_xorg7prefix}/share/locale/*/*/*
+%{_xorg7prefix}/share/fvwm/*
+%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils/quantize_pixmaps
+%dir %{_xorg7prefix}/lib/X11/fvwm2
+%{_xorg7prefix}/share/fvwm
+%dir %{_xorg7prefix}/share/locale/sv_SE
+%dir %{_xorg7prefix}/share/locale/sv_SE/LC_MESSAGES
+%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2
+%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps
+%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
+%{_xorg7mandir}/man1/*
+%{_datadir}/xsessions
%changelog -n fvwm2
+* Sun Aug 06 2006 - pnemec@suse.cz
+- major change in specfile instalation and file section to build
+ with Xorg 7
* Mon Jul 03 2006 - schwab@suse.de
- Set mandir.
* Tue May 30 2006 - pnemec@suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...