rpms/docbook-style-dsssl/devel docbook-style-dsssl.Makefile, 1.2, 1.3 docbook-style-dsssl.spec, 1.20, 1.21

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-dsssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9132

Modified Files:
	docbook-style-dsssl.Makefile docbook-style-dsssl.spec 
Log Message:
 ship manpage for collateindex.pl,  preserve attributes and timestamps in Makefile


Index: docbook-style-dsssl.Makefile
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-dsssl/devel/docbook-style-dsssl.Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- docbook-style-dsssl.Makefile	10 Nov 2005 12:31:40 -0000	1.2
+++ docbook-style-dsssl.Makefile	28 Aug 2009 09:47:06 -0000	1.3
@@ -1,38 +1,43 @@
 BINDIR = /usr/bin
 DESTDIR = /usr/share/sgml/docbook/dsssl-stylesheets-1.74b
+MANDIR= /usr/share/man
 
 all: install
 
-install: install-bin install-dtd install-dsl install-img install-misc
+install: install-bin install-dtd install-dsl install-img install-misc install-man
 
 install-bin:
 	mkdir -p $(BINDIR)
-	install bin/collateindex.pl $(BINDIR)
+	install -p bin/collateindex.pl $(BINDIR)
+
+install-man:
+	mkdir -p $(MANDIR)/man1
+	install -p bin/collateindex.pl.1 $(MANDIR)/man1
 
 install-dtd:
 	mkdir -p $(DESTDIR)/dtds/{decls,dbdsssl,html,imagelib,olink}
-	cp dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls
-	cp dtds/decls/xml.dcl $(DESTDIR)/dtds/decls
-	cp dtds/dbdsssl/dbdsssl.dtd $(DESTDIR)/dtds/dbdsssl
-	cp dtds/html/dbhtml.dtd $(DESTDIR)/dtds/html
-	cp dtds/html/ISOlat1.gml $(DESTDIR)/dtds/html
-	cp dtds/imagelib/imagelib.dtd $(DESTDIR)/dtds/imagelib
-	cp dtds/olink/olinksum.dtd $(DESTDIR)/dtds/olink
+	cp -p dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls
+	cp -p dtds/decls/xml.dcl $(DESTDIR)/dtds/decls
+	cp -p dtds/dbdsssl/dbdsssl.dtd $(DESTDIR)/dtds/dbdsssl
+	cp -p dtds/html/dbhtml.dtd $(DESTDIR)/dtds/html
+	cp -p dtds/html/ISOlat1.gml $(DESTDIR)/dtds/html
+	cp -p dtds/imagelib/imagelib.dtd $(DESTDIR)/dtds/imagelib
+	cp -p dtds/olink/olinksum.dtd $(DESTDIR)/dtds/olink
 
 install-dsl:
 	mkdir -p $(DESTDIR)/{lib,common,html,print,olink}
-	cp lib/dblib.dsl $(DESTDIR)/lib
-	cp common/*.dsl $(DESTDIR)/common
-	cp common/*.ent $(DESTDIR)/common
-	cp html/*.dsl $(DESTDIR)/html
-	cp lib/dblib.dsl $(DESTDIR)/lib
-	cp print/*.dsl $(DESTDIR)/print
-	cp olink/*.dsl $(DESTDIR)/olink
+	cp -p lib/dblib.dsl $(DESTDIR)/lib
+	cp -p common/*.dsl $(DESTDIR)/common
+	cp -p common/*.ent $(DESTDIR)/common
+	cp -p html/*.dsl $(DESTDIR)/html
+	cp -p lib/dblib.dsl $(DESTDIR)/lib
+	cp -p print/*.dsl $(DESTDIR)/print
+	cp -p olink/*.dsl $(DESTDIR)/olink
 
 install-img:
 	mkdir -p $(DESTDIR)/images/callouts
-	cp images/*.gif $(DESTDIR)/images
-	cp images/callouts/*.gif $(DESTDIR)/images/callouts
+	cp -p images/*.gif $(DESTDIR)/images
+	cp -p images/callouts/*.gif $(DESTDIR)/images/callouts
 
 #install-test:
 #	mkdir -p $(DESTDIR)/test/{cases,imagelib,xml}
@@ -42,5 +47,5 @@ install-img:
 #	cp test/xml/*.* $(DESTDIR)/test/xml
 
 install-misc:
-	cp catalog $(DESTDIR)
-	cp VERSION $(DESTDIR)
+	cp -p catalog $(DESTDIR)
+	cp -p VERSION $(DESTDIR)


Index: docbook-style-dsssl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-dsssl/devel/docbook-style-dsssl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- docbook-style-dsssl.spec	24 Jul 2009 20:25:59 -0000	1.20
+++ docbook-style-dsssl.spec	28 Aug 2009 09:47:06 -0000	1.21
@@ -1,6 +1,6 @@
 Name: docbook-style-dsssl
 Version: 1.79
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's modular stylesheets for DocBook
@@ -38,7 +38,7 @@ cp %{SOURCE1} Makefile
 %install
 DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets-%{version}
+make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets-%{version} MANDIR=$DESTDIR%{_mandir}
 cd ..
 ln -s dsssl-stylesheets-%{version} $DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets
 
@@ -48,9 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %doc BUGS README ChangeLog WhatsNew
 /usr/bin/collateindex.pl
+%{_mandir}/man1/collateindex.pl.1*
 /usr/share/sgml/docbook/dsssl-stylesheets-%{version}
 /usr/share/sgml/docbook/dsssl-stylesheets
 
@@ -87,6 +88,10 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 1.79-8
+- ship manpage for collateindex.pl
+- preserve attributes and timestamps in Makefile
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.79-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild