rpms/xfig/devel xfig.spec,1.52,1.53

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4303

Modified Files:
	xfig.spec 
Log Message:
* Tue Nov  4 2008 Hans de Goede <hdegoede at redhat.com> 3.2.5-12
- Various small specfile cleanups from merge review



Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xfig.spec	14 Jul 2008 08:39:05 -0000	1.52
+++ xfig.spec	8 Nov 2008 20:15:55 -0000	1.53
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -48,6 +48,7 @@
 Provides: %{name}-executable = %{version}-%{release}
 # Xaw3d used to be the one in a subpackage, now the plain Xaw version is
 Obsoletes: %{name}-Xaw3d < %{version}-%{release}
+Provides: %{name}-Xaw3d = %{version}-%{release}
 
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
@@ -101,10 +102,12 @@
 %patch16 -p1
 ln -nfs Doc/xfig.man xfig.man
 find -type f -print0 | xargs -0 chmod -x
+sed -i.save 's/\r//g' Doc/html/index.html
+touch -r Doc/html/index.html.save Doc/html/index.html
 rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
-sed -i 's/\r//g' Doc/html/index.html
 for i in Doc/html/{new_features,new_features.3.2.4,bugs_fixed.3.2.4}.html; do
   iconv -f ISO-8859-1 -t UTF8 $i > $i.UTF-8
+  touch -r $i $i.UTF-8
   mv $i.UTF-8 $i
 done
 
@@ -131,13 +134,17 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} install.all
+make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
+     INSTALL="install -p" install.all
 
 # install the Xaw3d version and the wrapper for the .desktop file
 mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain
 install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 install -m 755 %{name}-Xaw3d %{buildroot}%{_bindir}
 
+# remove the map generation scripts, these are for xfig developers only
+rm %{buildroot}%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble
+
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps \
          %{buildroot}%{_datadir}/applications
 
@@ -190,6 +197,8 @@
 
 
 %changelog
+* Tue Nov  4 2008 Hans de Goede <hdegoede at redhat.com> 3.2.5-12
+- Various small specfile cleanups from merge review
 
 * Mon Jul 14 2008 Ian Hutchinson <ihutch at mit.edu> 3.2.5-11
 - Fix incorrect height of modepanel.