Author: baggins Date: Wed Jul 27 19:34:32 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- drop gnome wm-properties support (gnome won't grok this WM)
- drop wmstyle support
- install runwm script as bindir/fvwm2-session and modify
desktop file accordingly
---- Files affected:
packages/fvwm2:
fvwm2-xsession.desktop (1.4 -> 1.5) , fvwm2.spec (1.88 -> 1.89)
---- Diffs:
================================================================
Index: packages/fvwm2/fvwm2-xsession.desktop
diff -u packages/fvwm2/fvwm2-xsession.desktop:1.4
packages/fvwm2/fvwm2-xsession.desktop:1.5
--- packages/fvwm2/fvwm2-xsession.desktop:1.4 Wed Dec 26 14:39:37 2007
+++ packages/fvwm2/fvwm2-xsession.desktop Wed Jul 27 21:34:27 2011
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=XSession
-Exec=fvwm2
+Exec=fvwm2-session
TryExec=fvwm2
Name=FVWM2
Comment=Improved version of the FVWM window manager
================================================================
Index: packages/fvwm2/fvwm2.spec
diff -u packages/fvwm2/fvwm2.spec:1.88 packages/fvwm2/fvwm2.spec:1.89
--- packages/fvwm2/fvwm2.spec:1.88 Thu Apr 8 09:41:08 2010
+++ packages/fvwm2/fvwm2.spec Wed Jul 27 21:34:27 2011
@@ -28,12 +28,11 @@
# Source0-md5: 8e11fa4f752c568b392973d13af993df
Source1: fvwm-2.0.46.icons.tar.gz
# Source1-md5: 8d81420cf49442fca4bb2b61ae54eeb9
-Source2: %{name}.desktop
-Source3: %{name}-system.%{name}rc.tar.gz
-# Source3-md5: 22c1f6c5ab4bd84376daa37debd3e889
-Source4: %{name}.RunWM
+Source2: %{name}-system.%{name}rc.tar.gz
+# Source2-md5: 22c1f6c5ab4bd84376daa37debd3e889
+Source3: %{name}.RunWM
+Source4: %{name}-xsession.desktop
Source5: mozilla.xpm
-Source6: %{name}-xsession.desktop
Patch0: %{name}-paths.patch
Patch1: FvwmPager.patch
Patch2: %{name}-locale_names.patch
@@ -63,7 +62,6 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/X11/fvwm2
-%define _wmpropsdir /usr/share/gnome/wm-properties
%description
FVWM2 (the F stands for whatever you want, but the VWM stands for
@@ -134,7 +132,7 @@
fvwm-perllib, FvwmPerl i zależne moduły.
%prep
-%setup -n fvwm-%{version} -q -a1 -a3
+%setup -n fvwm-%{version} -q -a1 -a2
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -179,7 +177,7 @@
DESTDIR=$RPM_BUILD_ROOT
install -d \
- $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir}} \
+ $RPM_BUILD_ROOT%{_sysconfdir} \
$RPM_BUILD_ROOT{%{_datadir}/{locale,xsessions},%{_pixmapsdir}/mini}
install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
@@ -193,10 +191,10 @@
# Conflicts with wmmaker
mv $RPM_BUILD_ROOT%{_pixmapsdir}/xv{,-fvwm}.xpm
-install %{SOURCE2} $RPM_BUILD_ROOT%{_wmpropsdir}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-session
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+
touch $RPM_BUILD_ROOT%{_sysconfdir}/fvwm2.menu2
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xpmroot.1
@@ -220,11 +218,11 @@
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fvwm2.menu.m4
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system.fvwm2rc
%ghost %{_sysconfdir}/fvwm2.menu2
-%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
%attr(755,root,root) %{_bindir}/[!f]*
%attr(755,root,root) %{_bindir}/fvwm
%attr(755,root,root) %{_bindir}/fvwm2
%attr(755,root,root) %{_bindir}/fvwm-[!p]*
+%attr(755,root,root) %{_bindir}/fvwm-session
%dir %{_libdir}/fvwm
%attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPWT]*
%attr(755,root,root) %{_libdir}/fvwm/FvwmD[!e]*
@@ -237,7 +235,6 @@
%dir %{_datadir}/fvwm
%{_datadir}/fvwm/[!p]*
%{_datadir}/xsessions/%{name}.desktop
-%{_wmpropsdir}/fvwm2.desktop
%{_mandir}/man1/[!Ff]*.1*
%{_mandir}/man1/Fvwm[!DGPW]*.1*
%{_mandir}/man1/FvwmD[!e]*.1*
@@ -274,6 +271,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2011/07/27 19:34:27 baggins
+- drop gnome wm-properties support (gnome won't grok this WM)
+- drop wmstyle support
+- install runwm script as bindir/fvwm2-session and modify
+ desktop file accordingly
+
Revision 1.88 2010/04/08 07:41:08 pluto
- libpng14 patch fixed.
- updated to 2.5.28.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fvwm2/fvwm2-xsession.desktop?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fvwm2/fvwm2.spec?r1=1.88&r2=1.89&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
