SPECS: xorg-app-twm.spec - merged twm.desktop and twm-xsession.des...

[qboosh]

Author: qboosh                       Date: Fri Feb  3 15:15:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged twm.desktop and twm-xsession.desktop from monolith

---- Files affected:
SPECS:
   xorg-app-twm.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/xorg-app-twm.spec
diff -u SPECS/xorg-app-twm.spec:1.11 SPECS/xorg-app-twm.spec:1.12
--- SPECS/xorg-app-twm.spec:1.11	Thu Jan 12 14:29:11 2006
+++ SPECS/xorg-app-twm.spec	Fri Feb  3 16:15:07 2006
@@ -10,6 +10,8 @@
 Group:		X11/Window Managers
 Source0:	http://xorg.freedesktop.org/releases/X11R7.0/src/app/twm-%{version}.tar.bz2
 # Source0-md5:	b1a8abf4cd9d8d7269e6627c62ffee0f
+Source1:	twm.desktop
+Source2:	twm-xsession.desktop
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -21,6 +23,9 @@
 Obsoletes:	twm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_wmpropsdir	/usr/share/wm-properties
+%define		_xsessdir	/usr/share/xsessions
+
 %description
 Twm is a window manager for the X Window System. It provides
 titlebars, shaped windows, several forms of icon management,
@@ -57,6 +62,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
+install -D %{SOURCE2} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,6 +72,8 @@
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog
 %attr(755,root,root) %{_bindir}/*
+%{_wmpropsdir}/twm.desktop
+%{_xsessdir}/twm.desktop
 %{_mandir}/man1/*.1x*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -72,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/02/03 15:15:07  qboosh
+- merged twm.desktop and twm-xsession.desktop from monolith
+
 Revision 1.11  2006/01/12 13:29:11  qboosh
 - 1.0.1 (X11R7.0 release)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.11&r2=1.12&f=u