rpms/sgml-common/devel sgml-common.spec,1.25,1.26

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/sgml-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1186

Modified Files:
	sgml-common.spec 
Log Message:
do not provide explicit url for xml-common subpackage, fix trailing spaces, add requires for /bin/basename (#501360)


Index: sgml-common.spec
===================================================================
RCS file: /cvs/extras/rpms/sgml-common/devel/sgml-common.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sgml-common.spec	26 Feb 2009 00:45:27 -0000	1.25
+++ sgml-common.spec	19 May 2009 13:18:31 -0000	1.26
@@ -1,6 +1,6 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 27%{?dist}
+Release: 28%{?dist}
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files
@@ -10,8 +10,8 @@ License: GPL+
 BuildArch: noarch
 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 
+#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/
 
@@ -30,6 +30,7 @@ Patch4: sgml-common-0.6.3-docdir.patch
 
 BuildRequires: libxml2 >= 2.4.8-2
 BuildRequires: automake14
+Requires: /bin/basename
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -41,11 +42,10 @@ up-to-date Open Catalog file.
 Group: Applications/Text
 Summary: Common XML catalog and DTD files
 License: GPL+
-URL: http://www.w3.org/2003/entities/
 
 %description -n xml-common
-The xml-common is a subpackage of sgml-common which contains 
-a collection XML catalogs that are useful for processing XML, 
+The xml-common is a subpackage of sgml-common which contains
+a collection XML catalogs that are useful for processing XML,
 but that don't need to be included in main package.
 
 %prep
@@ -58,7 +58,7 @@ but that don't need to be included in ma
 #%patch4 -p1 -b .docdir
 
 # replace bogus links with files
-for file in COPYING INSTALL install-sh missing mkinstalldirs; do 
+for file in COPYING INSTALL install-sh missing mkinstalldirs; do
    rm $file
    cp -p /usr/share/automake-1.4/$file .
 done
@@ -94,7 +94,7 @@ XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}
 # Also create the common DocBook catalog
 %{_bindir}/xmlcatalog --noout --create \
 	$RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook/xmlcatalog
-ln -s %{_sysconfdir}/sgml/docbook/xmlcatalog\
+ln -sf %{_sysconfdir}/sgml/docbook/xmlcatalog\
 	$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xmlcatalog
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl
@@ -140,6 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xml
 
 %changelog
+* Tue May 19 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.3-28
+- do not provide explicit url for xml-common subpackage,
+  fix trailing spaces
+- add Requires: /bin/basename (#501360)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -166,13 +171,13 @@ rm -rf $RPM_BUILD_ROOT
 - 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 
+  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) 
+- Fixed broken URL (changed to XML entity declarations) (bug #237726)
 - Rebuilt
 
 * Tue May 15 2007 Tim Waugh <twaugh at redhat.com> 0.6.3-20