Hello community, here is the log from the commit of package fvwm2 checked in at Thu Sep 7 01:14:14 CEST 2006. -------- --- fvwm2/fvwm2.changes 2006-09-04 17:59:44.000000000 +0200 +++ fvwm2/fvwm2.changes 2006-09-05 14:38:38.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 5 14:35:24 CEST 2006 - lmichnovic@suse.cz + +- distinquishing from X.org version which config file to install + (Source4 resp. Source5) + +------------------------------------------------------------------- New: ---- _system.fvwm2rc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.TvHmVu/_old 2006-09-07 01:13:24.000000000 +0200 +++ /var/tmp/diff_new_pack.TvHmVu/_new 2006-09-07 01:13:24.000000000 +0200 @@ -18,13 +18,14 @@ Obsoletes: fvwm xpmroot Autoreqprov: on Version: 2.5.16 -Release: 7 +Release: 9 Summary: Improved Version of FVWM Window Manager URL: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 Source1: fvwm_icons.tar.bz2 Source3: %name.desktop Source4: system.fvwm2rc +Source5: _system.fvwm2rc BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: xdg-menu, desktop-data, mktemp, xli Patch0: fvwm-configure.patch @@ -93,7 +94,11 @@ # # default config install -d -m 755 $RPM_BUILD_ROOT/etc/X11/fvwm2 +%if "%(xft-config --prefix)" == "/usr" install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc +%else +install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc +%endif # # some extra utils install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils @@ -143,8 +148,21 @@ %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils %{_xorg7mandir}/man1/* %{_datadir}/xsessions +%if "%(xft-config --prefix)" == "/usr/X11R6" +%dir %{_xorg7prefix}/share/locale/ar +%dir %{_xorg7prefix}/share/locale/ar/LC_MESSAGES +%dir %{_xorg7prefix}/share/locale/de +%dir %{_xorg7prefix}/share/locale/de/LC_MESSAGES +%dir %{_xorg7prefix}/share/locale/fr +%dir %{_xorg7prefix}/share/locale/fr/LC_MESSAGES +%dir %{_xorg7prefix}/share/locale/zh_CN +%dir %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES +%endif %changelog -n fvwm2 +* Tue Sep 05 2006 - lmichnovic@suse.cz +- distinquishing from X.org version which config file to install + (Source4 resp. Source5) * Mon Sep 04 2006 - lmichnovic@suse.cz - omitting X11R6 in config file (which is Source4) - specifying X.org libs and headers ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org