PISSED !!! DO NOT COMMIT DIRECTLY IF NOT ALLOWED PERSONALLY

* Makefile.am libxml.spec.in: backing up non-documented changes commited without review or aproval by Jens Finke <jens@gnome.org> * HACKING: made 100% clear that no commit should be done directly Daniel
ConradIrwin · Sep 19, 2001 · 1a12361 · 1a12361
1 parent de8c8af
commit 1a12361
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 95 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,10 @@
-Wed Sep 19 08:42:20 CEST 2001 Jens Finke <jens@gnome.org>
+Wed Sep 19 10:01:37 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
-	* Makfefile.am (dist-hook): Don't copy libxml.spec, it's already
-	included due to listing in EXTRA_DIST.
+        PISSED !!! DO NOT COMMIT DIRECTLY IF NOT ALLOWED PERSONALLY
+	* Makefile.am libxml.spec.in: backing up non-documented changes
+	  commited without review or aproval by Jens Finke <jens@gnome.org>
+	* HACKING: made 100% clear that no commit should be done directly
 
-	* libxml.spec.in: Updated.
-
 Mon Sep 17 18:52:37 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in: Joe Orton provided a patch fixing a problem

diff --git a/HACKING b/HACKING
@@ -12,6 +12,8 @@ NOTE:
      Rules for commits on the gnome-xml module
      =========================================
 
+  BEFORE READING FURTHER: DO NOT COMMIT DIRECTLY !
+
 If what you are patching is a non-compilation issue either at compile
 time or linking time on one of the main Linux platforms, then feel free
 to patch first and send mail afterward as long as the change is limited.
@@ -29,5 +31,5 @@ This simply mean that I'm on holliday or on the road.
 Daniel
 
 P.S.: Bjorn Reese, William Brack and Thomas Broyer get an exception for
-      the send before commit rule as well as John Fleck for the doc subdir
+      the send before commit rule as well as John Fleck for the doc maintenance
 
diff --git a/Makefile.am b/Makefile.am
@@ -482,7 +482,8 @@ Validtests : xmllint
 	      rm result.$$name error.$$name ; \
 	  fi ; fi ; done)
 
-dist-hook:
+dist-hook: libxml.spec
+	-cp libxml.spec $(distdir)
 	(cd $(srcdir) ; tar -cf - --exclude CVS win32 test result SAXresult ) | (cd $(distdir); tar xf -)
 
 cleantar:

diff --git a/libxml.spec.in b/libxml.spec.in
@@ -1,12 +1,19 @@
-Summary:	Library providing XML and HTML support
-Name:		libxml2
-Version:	@VERSION@
-Release:	1
-License:	LGPL
-Group:		Development/Libraries
-Source:		ftp://xmlsoft.org/%{name}-%{version}.tar.gz
-BuildRoot:	/var/tmp/%{name}-%{version}-root
-URL:		http://xmlsoft.org/
+# Note that this is NOT a relocatable package
+%define ver      @VERSION@
+%define prefix   /usr
+%define datadir  %{prefix}/share
+
+Summary: Library providing XML and HTML support
+Name: libxml2
+Version: %ver
+Release: 1
+Copyright: LGPL
+Group: Development/Libraries
+Source: ftp://xmlsoft.org/libxml2-%{ver}.tar.gz
+BuildRoot: /var/tmp/libxml2-%{PACKAGE_VERSION}-root
+
+URL: http://xmlsoft.org/
+Docdir: %{datadir}/doc
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -20,9 +27,9 @@ available, with existing HTTP and FTP modules and combined to an
 URI library.
 
 %package devel
-Summary:	Libraries, includes, etc. to develop XML and HTML applications
-Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Summary: Libraries, includes, etc. to develop XML and HTML applications
+Group: Development/Libraries
+Requires: libxml2 = %{version}
 
 %description devel
 Libraries, include files, etc you can use to develop XML applications.
@@ -37,30 +44,52 @@ available, with existing HTTP and FTP modules and combined to an
 URI library.
 
 
+%changelog
+
+* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu>
+
+[2.3.7]
+- Added libxml.m4 to the distribution file list
+- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0
+- Moved programmer documentation into the devel package
+
+* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com>
+
+- corrected the spec file alpha stuff
+- switched to version 1.7.1
+- Added validation, XPath, nanohttp, removed memory leaks
+- Renamed CHAR to xmlChar
+
+* Wed Jun  2 1999 Daniel Veillard <daniel@veillard.com>
+
+- Switched to version 1.1: SAX extensions, better entities support, lots of
+  bug fixes.
+
+* Sun Oct  4 1998 Daniel Veillard <daniel@veillard.com>
+
+- Added xml-config to the package
+
+* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com>
+
+- Built release 0.30
+
 %prep
-%setup -q
+%setup
 
 %build
-%ifarch alpha
-    MYARCH_FLAGS="--host=alpha-redhat-linux"
-%endif
-
 # Needed for snapshot releases.
-MYCFLAGS="$RPM_OPT_FLAGS"
 if [ ! -f configure ]; then
-    CFLAGS="$MYCFLAGS" ./autogen.sh $MYARCH_FLAGS \
-        --prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir} \
-	--mandir=%{_mandir} --libdir=%{_libdir} \
-	--includedir=%{_includedir} \
-	--with-html-dir='$(datadir)/gtk-doc/html'
+%ifarch alpha
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
+%else
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
+%endif
 else
-    CFLAGS="$MYCFLAGS" ./configure $MYARCH_FLAGS \
-        --prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir} \
-	--mandir=%{_mandir} --libdir=%{_libdir} \
-	--includedir=%{_includedir} \
-	--with-html-dir='$(datadir)/gtk-doc/html'
+%ifarch alpha
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
+%else
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man
+%endif
 fi
 
 if [ "$SMP" != "" ]; then
@@ -73,12 +102,9 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make -k sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
-    prefix=$RPM_BUILD_ROOT%{_prefix} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    install 
+install -d $RPM_BUILD_ROOT%{datadir}/man/man1
+install -d $RPM_BUILD_ROOT%{datadir}/man/man4
+make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{datadir}/man install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,61 +117,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO
-%doc %{_mandir}/man1/xmllint.1*
-%doc %{_mandir}/man1/xmlcatalog.1*
-%doc %{_mandir}/man4/libxml.4*
+%doc %{prefix}/share/man/man1/xmllint.1*
+%doc %{prefix}/share/man/man1/xmlcatalog.1*
+%doc %{prefix}/share/man/man4/libxml.4*
 
-%{_libdir}/lib*.so.*
-%{_bindir}/xmllint
-%{_bindir}/xmlcatalog
+%{prefix}/lib/lib*.so.*
+%{prefix}/bin/xmllint
+%{prefix}/bin/xmlcatalog
 
 %files devel
 %defattr(-, root, root)
 
-%doc %{_mandir}/man1/xml2-config.1*
-%{_libdir}/lib*.so
-%{_libdir}/*a
-%{_libdir}/*.sh
-%{_includedir}/libxml2
-%{_bindir}/xml2-config
-%{_datadir}/gtk-doc/html/%{name}-%{version}
-%{_datadir}/aclocal/libxml.m4
-%{_libdir}/pkgconfig/*.pc
-
-
-%changelog
-* Wed Sep 19 2001 Jens Finke <jens@gnome.org>
-- Updated file to match gpp standard
-- beautified header
-- moved changelog to the end of the file
-- removed all hardcoded paths (prefix, docdir)
-- make use of rpm macros (like _prefix, _bindir, ...)
-- moved the html doc to $(datadir)/gtk-doc/html where
-  other GNOME 2.0 packages reside too
-- removed mandir hacks, this should be handled by 
-  a proper ~/.rpmmacros file. 
-
-* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu>
-- Added libxml.m4 to the distribution file list
-- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0
-- Moved programmer documentation into the devel package
+%doc /usr/share/man/man1/xml2-config.1*
+%doc doc/*.html doc/html
 
-* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com>
-
-- corrected the spec file alpha stuff
-- switched to version 1.7.1
-- Added validation, XPath, nanohttp, removed memory leaks
-- Renamed CHAR to xmlChar
-
-* Wed Jun  2 1999 Daniel Veillard <daniel@veillard.com>
-
-- Switched to version 1.1: SAX extensions, better entities support, lots of
-  bug fixes.
-
-* Sun Oct  4 1998 Daniel Veillard <daniel@veillard.com>
-
-- Added xml-config to the package
-
-* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com>
-
-- Built release 0.30
+%{prefix}/lib/lib*.so
+%{prefix}/lib/*a
+%{prefix}/lib/*.sh
+%{prefix}/include/*
+%{prefix}/bin/xml2-config
+%{prefix}/share/aclocal/libxml.m4
+%{prefix}/lib/pkgconfig/libxml-2.0.pc