[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/sgml-common/devel sgml-common-0.6.3-docdir.patch, 1.1, 1.2 sgml-common-automake.patch, 1.1, 1.2 sgml-common-xmldir.patch, 1.1, 1.2 sgml-common.spec, 1.15, 1.16



Author: twaugh

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

Modified Files:
	sgml-common-0.6.3-docdir.patch sgml-common-automake.patch 
	sgml-common-xmldir.patch sgml-common.spec 
Log Message:
* Tue May 15 2007 Tim Waugh <twaugh redhat com> 0.6.3-20
- Added dist tag.
- Fixed summary.
- Removed build dependency on autoconf/automake.


sgml-common-0.6.3-docdir.patch:

Index: sgml-common-0.6.3-docdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sgml-common/devel/sgml-common-0.6.3-docdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sgml-common-0.6.3-docdir.patch	9 Sep 2004 12:19:42 -0000	1.1
+++ sgml-common-0.6.3-docdir.patch	15 May 2007 17:16:22 -0000	1.2
@@ -9,3 +9,17 @@
  AC_SUBST(docdir)
  
  dnl Checks for programs.
+--- sgml-common-0.6.3/configure.docdir	2007-05-15 17:41:20.000000000 +0100
++++ sgml-common-0.6.3/configure	2007-05-15 17:45:54.000000000 +0100
+@@ -777,6 +777,11 @@
+ 
+ docdir='$(prefix)/doc'
+ 
++# Check whether --with-docdir or --without-docdir was given.
++if test "${with_docdir+set}" = set; then
++  withval="$with_docdir"
++  docdir=$withval
++fi;
+ 
+ 
+ 

sgml-common-automake.patch:

Index: sgml-common-automake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sgml-common/devel/sgml-common-automake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sgml-common-automake.patch	9 Sep 2004 12:19:26 -0000	1.1
+++ sgml-common-automake.patch	15 May 2007 17:16:22 -0000	1.2
@@ -1,6 +1,17 @@
---- sgml-common-0.6.3/doc/man/Makefile.am.automake	Wed Apr 24 11:58:17 2002
-+++ sgml-common-0.6.3/doc/man/Makefile.am	Wed Apr 24 11:59:02 2002
+--- 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
 -man8_DATA = *.8
-+man8_MANS = install-catalog.8
++man8_DATA = 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 @@
+ docdir = @docdir@
+ 
+ man8dir = $(mandir)/man8
+-man8_DATA = *.8
++man8_DATA = install-catalog.8
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
+ DATA =  $(man8_DATA)

sgml-common-xmldir.patch:

Index: sgml-common-xmldir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sgml-common/devel/sgml-common-xmldir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sgml-common-xmldir.patch	9 Sep 2004 12:19:15 -0000	1.1
+++ sgml-common-xmldir.patch	15 May 2007 17:16:22 -0000	1.2
@@ -6,3 +6,14 @@
  isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent \
                ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent \
                ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent \
+--- sgml-common-0.6.3/xml-iso-entities/Makefile.in.xmldir	2007-05-15 17:21:31.000000000 +0100
++++ sgml-common-0.6.3/xml-iso-entities/Makefile.in	2007-05-15 17:21:43.000000000 +0100
+@@ -62,7 +62,7 @@
+ VERSION = @VERSION@
+ docdir = @docdir@
+ 
+-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986
++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986
+ isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent               ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent               ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent               ISOtech.ent catalog
+ 
+ 


Index: sgml-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sgml-common/devel/sgml-common.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sgml-common.spec	15 May 2007 16:04:52 -0000	1.15
+++ sgml-common.spec	15 May 2007 17:16:22 -0000	1.16
@@ -25,8 +25,6 @@
 
 Requires: sh-utils fileutils textutils grep
 BuildRequires: libxml2 >= 2.4.8-2
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -56,9 +54,9 @@
 tar zxf %{SOURCE2}
 %patch3 -p1 -b .automake
 %patch4 -p1 -b .docdir
-aclocal
-automake --add-missing --copy
-
+touch configure
+find -name '*.in' | xargs touch
+touch aclocal.m4
 
 %build
 %configure --with-docdir=%{_docdir}
@@ -132,9 +130,9 @@
 
 %changelog
 * Tue May 15 2007 Tim Waugh <twaugh redhat com> 0.6.3-20
-- Bumped release and rebuilt.
 - Added dist tag.
 - Fixed summary.
+- Removed build dependency on autoconf/automake.
 
 * Tue Oct 24 2006 Tim Waugh <twaugh redhat com> 0.6.3-19
 - Removed stale URL (bug #210848).


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]