SPECS: fvwm-crystal.spec - 3.0.3 rel 1 - yet another Makefile form...

[mguevara]

Author: mguevara                     Date: Mon Feb 20 02:35:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 3.0.3 rel 1 - yet another Makefile format, cosmetics

---- Files affected:
SPECS:
   fvwm-crystal.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/fvwm-crystal.spec
diff -u SPECS/fvwm-crystal.spec:1.29 SPECS/fvwm-crystal.spec:1.30
--- SPECS/fvwm-crystal.spec:1.29	Fri Feb 17 22:00:21 2006
+++ SPECS/fvwm-crystal.spec	Mon Feb 20 03:35:03 2006
@@ -2,13 +2,13 @@
 Summary:	Desktop Environment
 Summary(pl):	Graficzne środowisko robocze
 Name:		fvwm-crystal
-Version:	3.0.2
-Release:	3
+Version:	3.0.3
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	http://download.gna.org/fvwm-crystal/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	292609d9edc1ac47b653c3b26eb7211c
+# Source0-md5:	66d894d3264f37db2e9c3f89d5d932d6
 URL:		http://www.fvwm-crystal.org/
 BuildRequires:	sed >= 4.0
 Requires:	ImageMagick
@@ -45,24 +45,28 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_prefix}/share/xsessions
-%{__make} install \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-	XSESSIONDIRS=$RPM_BUILD_ROOT%{_prefix}/share/xsessions
-
-sed -i  's#installpath=.*$#installpath=/usr/share/fvwm-crystal/fvwm#g' $RPM_BUILD_ROOT%{_bindir}/%{name} 
+install addons/fvwm-crystal.desktop $RPM_BUILD_ROOT%{_prefix}/share/xsessions
+rm -f   addons/fvwm-crystal.desktop
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/%{name}
+%{__make} install \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+%{__make} install-doc \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+	
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 # COPYING contains only note, not full GPL text
-%doc doc/* AUTHORS INSTALL COPYING NEWS README addons/X* addons/sudo
+%doc doc/* AUTHORS INSTALL COPYING NEWS README
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/fvwm
+%dir %{_datadir}/%{name}/addons
 %attr(755,root,root) %{_datadir}/%{name}/fvwm/Applications
 %{_datadir}/%{name}/fvwm/colorsets
 %{_datadir}/%{name}/fvwm/components
@@ -72,6 +76,7 @@
 %{_datadir}/%{name}/fvwm/locale
 %{_datadir}/%{name}/fvwm/preferences
 %{_datadir}/%{name}/fvwm/recipes
+%{_datadir}/%{name}/addons/*
 %attr(755,root,root) %{_datadir}/%{name}/fvwm/scripts
 %{_datadir}/%{name}/fvwm/wallpapers
 %{_datadir}/xsessions/fvwm-crystal.desktop
@@ -82,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/02/20 02:35:03  mguevara
+- 3.0.3 rel 1 - yet another Makefile format, cosmetics
+
 Revision 1.29  2006/02/17 21:00:21  qboosh
 - missing dirs, unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fvwm-crystal.spec?r1=1.29&r2=1.30&f=u