rpms/sgml-common/devel sgml-common-automake.patch, 1.2, 1.3 sgml-common.spec, 1.17, 1.18

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Wed Nov 21 14:04:26 UTC 2007 

Author: ovasik

Update of /cvs/extras/rpms/sgml-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12206

Modified Files:
	sgml-common-automake.patch sgml-common.spec 
Log Message:
Merge review, for details see Changelog or rhb #226415

sgml-common-automake.patch:

Index: sgml-common-automake.patch
===================================================================
RCS file: /cvs/extras/rpms/sgml-common/devel/sgml-common-automake.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sgml-common-automake.patch	15 May 2007 17:16:22 -0000	1.2
+++ sgml-common-automake.patch	21 Nov 2007 14:04:23 -0000	1.3
@@ -1,17 +1,17 @@
 --- sgml-common-0.6.3/doc/man/Makefile.am.automake	2001-01-30 14:42:22.000000000 +0000
 +++ sgml-common-0.6.3/doc/man/Makefile.am	2007-05-15 18:14:45.000000000 +0100
-@@ -1,2 +1,2 @@
- man8dir	  = $(mandir)/man8
+@@ -1,2 +1,1 @@
+-man8dir	  = $(mandir)/man8
 -man8_DATA = *.8
-+man8_DATA = install-catalog.8
++man8_MANS = install-catalog.8
 --- sgml-common-0.6.3/doc/man/Makefile.in.automake	2007-05-15 18:14:36.000000000 +0100
 +++ sgml-common-0.6.3/doc/man/Makefile.in	2007-05-15 18:14:52.000000000 +0100
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,6 @@
  docdir = @docdir@
  
- man8dir = $(mandir)/man8
+-man8dir = $(mandir)/man8
 -man8_DATA = *.8
-+man8_DATA = install-catalog.8
++man8_MANS = install-catalog.8
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES = 
  DATA =  $(man8_DATA)


Index: sgml-common.spec
===================================================================
RCS file: /cvs/extras/rpms/sgml-common/devel/sgml-common.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sgml-common.spec	28 May 2007 14:31:38 -0000	1.17
+++ sgml-common.spec	21 Nov 2007 14:04:23 -0000	1.18
@@ -1,30 +1,35 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files
 
-License: GPL
+License: GPL+
 
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#Actually - there is no homepage of this project, on that URL 
+#page you could get complete ISO 8879 listing as was on the 
+#old page - only part of it is included in sgml-common package.
+URL: http://www.w3.org/2003/entities/
+
 Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz
-Source1: sgml-common-CHANGES
-Source2: sgml-common-automake.tar.gz
-# From openjade:
-Source3: xml.dcl
-Source4: xml.soc
-Source5: html.dcl
-Source6: html.soc
+# Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date:
+Source1: xml.dcl
+Source2: xml.soc
+Source3: html.dcl
+Source4: html.soc
+
 Patch0: sgml-common-umask.patch
 Patch1: sgml-common-xmldir.patch
 Patch2: sgml-common-quotes.patch
 Patch3: sgml-common-automake.patch
 Patch4: sgml-common-0.6.3-docdir.patch
 
-Requires: sh-utils fileutils textutils grep
 BuildRequires: libxml2 >= 2.4.8-2
+BuildRequires: automake autoconf
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -34,10 +39,9 @@
 
 %package -n xml-common
 Group: Applications/Text
-Summary: Common XML catalog and DTD files.
-License: GPL
+Summary: Common XML catalog and DTD files
+License: GPL+
 URL: http://www.w3.org/2003/entities/
-Requires: sh-utils fileutils textutils grep
 
 %description -n xml-common
 The xml-common package contains a collection of entities and DTDs
@@ -50,85 +54,90 @@
 %patch0 -p1 -b .umask
 %patch1 -p1 -b .xmldir
 %patch2 -p1 -b .quotes
-rm install-sh missing mkinstalldirs
-tar zxf %{SOURCE2}
 %patch3 -p1 -b .automake
-%patch4 -p1 -b .docdir
-touch configure
-find -name '*.in' | xargs touch
-touch aclocal.m4
+#patch4 not applied but still shipped with SRPM(see #226415 MergeReview)
+#%patch4 -p1 -b .docdir
+aclocal
+autoconf
+automake --add-missing
 
 %build
-%configure --with-docdir=%{_docdir}
-
+%configure
 
 %install
-DESTDIR=$RPM_BUILD_ROOT
-rm -rf $DESTDIR
-%makeinstall docdir=%{buildroot}%{_docdir}
-cp %{SOURCE1} CHANGES
-mkdir $RPM_BUILD_ROOT/etc/xml
-mkdir $RPM_BUILD_ROOT/usr/share/sgml/docbook
+rm -rf $RPM_BUILD_ROOT
+export DESTDIR="$RPM_BUILD_ROOT"
+make install docdir=$RPM_BUILDROOT%{_docdir} prefix=$RPM_BUILDROOT%{_prefix} \
+mandir=$RPMBUILDROOT%{_mandir}
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xml
+mkdir $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
 # Create an empty XML catalog.
-XMLCATALOG=$RPM_BUILD_ROOT/etc/xml/catalog
-/usr/bin/xmlcatalog --noout --create $XMLCATALOG
+XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
+%{_bindir}/xmlcatalog --noout --create $XMLCATALOG
 # Now put the common DocBook entries in it
-/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+%{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"-//OASIS//ENTITIES DocBook XML" \
-	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
-/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+%{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"-//OASIS//DTD DocBook XML" \
-	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
-/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+%{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"ISO 8879:1986" \
-	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
-/usr/bin/xmlcatalog --noout --add "delegateSystem" \
+	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+%{_bindir}/xmlcatalog --noout --add "delegateSystem" \
 	"http://www.oasis-open.org/docbook/" \
-	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
-/usr/bin/xmlcatalog --noout --add "delegateURI" \
+	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+%{_bindir}/xmlcatalog --noout --add "delegateURI" \
 	"http://www.oasis-open.org/docbook/" \
-	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
+	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 # Also create the common DocBook catalog
-/usr/bin/xmlcatalog --noout --create \
-	$RPM_BUILD_ROOT/usr/share/sgml/docbook/xmlcatalog
+%{_bindir}/xmlcatalog --noout --create \
+	$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xmlcatalog
 
-rm -f %{buildroot}/usr/share/sgml/xml.dcl
-install -m0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
-	%{buildroot}/usr/share/sgml
-rm -rf %{buildroot}/usr/share/xml/*
+rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl
+install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
+	$RPM_BUILD_ROOT%{_datadir}/sgml
+rm -rf $RPM_BUILD_ROOT%{_datadir}/xml/*
 
 
 %clean
-DESTDIR=$RPM_BUILD_ROOT
-rm -rf $DESTDIR
-
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-,root,root)
-%dir /etc/sgml
-%config(noreplace) /etc/sgml/sgml.conf
-%dir /usr/share/sgml
-%dir /usr/share/sgml/sgml-iso-entities-8879.1986
-/usr/share/sgml/sgml-iso-entities-8879.1986/*
-/usr/share/sgml/xml.dcl
-/usr/share/sgml/xml.soc
-/usr/share/sgml/html.dcl
-/usr/share/sgml/html.soc
-/usr/bin/sgmlwhich
-/usr/bin/install-catalog
+%defattr (-,root,root, -)
+%dir %{_sysconfdir}/sgml
+%config(noreplace) %{_sysconfdir}/sgml/sgml.conf
+%dir %{_datadir}/sgml
+%dir %{_datadir}/sgml/sgml-iso-entities-8879.1986
+%{_datadir}/sgml/sgml-iso-entities-8879.1986/*
+%{_datadir}/sgml/xml.dcl
+%{_datadir}/sgml/xml.soc
+%{_datadir}/sgml/html.dcl
+%{_datadir}/sgml/html.soc
+%{_bindir}/sgmlwhich
+%{_bindir}/install-catalog
 %{_mandir}/*/*
 %{_docdir}/*
 
 %files -n xml-common
-%defattr (-,root,root)
-%dir /etc/xml
-%config(noreplace) /etc/xml/catalog
-%dir /usr/share/sgml
-%dir /usr/share/sgml/docbook
-%config(noreplace) /usr/share/sgml/docbook/xmlcatalog
-%dir /usr/share/xml
+%defattr (-,root,root,-)
+%dir %{_sysconfdir}/xml
+%config(noreplace) %{_sysconfdir}/xml/catalog
+%dir %{_datadir}/sgml
+%dir %{_datadir}/sgml/docbook
+%{_datadir}/sgml/docbook/xmlcatalog
+%dir %{_datadir}/xml
 
 %changelog
+* Thu Nov 15 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.3-22
+- Merge Review(226415)
+- changed: License Tag, using RPM macros instead of hardcoded
+  dirs, summary ended with dot, added URL, removed CHANGES
+  file as obsolete, preserved timestamps and some other cosmetic 
+  changes
+- no longer shipping old automake tarball, fixed issue with man8_DATA,
+  BuildRequire:Automake,Autoconf again(see MergeReview discussion)
+
 * Mon May 28 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.3-21
 - Fixed broken URL (changed to XML entity declarations) (bug #237726) 
 - Rebuilt

More information about the fedora-extras-commits mailing list