rpms/tclxml/FC-4 tclxml.spec,1.2,1.3

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclxml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24764/FC-4

Modified Files:
	tclxml.spec 
Log Message:
Fix Requires: on subpackages to include full base package version




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/FC-4/tclxml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclxml.spec	9 Jan 2006 03:00:47 -0000	1.2
+++ tclxml.spec	1 Jun 2006 18:44:52 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -19,7 +19,7 @@
 %package expat
 Summary: The Tcl xml parser built with the expat xml parser
 Group: Development/Libraries
-Requires: tclxml = %{version}
+Requires:       %{name} = %{version}-%{release}
 %description expat
 TclXML is a package that provides optimized XML parsing for the Tcl
 scripting language.  This implementation is built against the expat XML
@@ -28,7 +28,7 @@
 %package libxml2
 Summary: The Tcl xml parser built with the libxml2 xml parser
 Group: Development/Libraries
-Requires: tclxml = %{version}
+Requires:       %{name} = %{version}-%{release}
 %description libxml2
 TclXML is a package that provides optimized XML parsing for the Tcl
 scripting language.  This implementation is built against the libxml2
@@ -37,7 +37,7 @@
 %package devel
 Summary: Development files for the tclxml packages
 Group: Development/Libraries
-Requires: tclxml = %{version}
+Requires:       %{name} = %{version}-%{release}
 %description devel
 Development header files for the tclxml packages.  This includes the
 header files for the base, expat, and libxml2 subpackages.
@@ -64,12 +64,6 @@
 chmod a-x tclexpat.c
 chmod a-x tclxml.c
 
-#autoreconf
-#cd expat
-#autoreconf
-#cd ../libxml2
-#autoreconf
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -83,6 +77,7 @@
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 cd expat
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -122,29 +117,41 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Thu Jun 1 2006 Wart <wart at kobold.org> - 3.1-3
+- Fixed Requires: for subpackages
+
 * Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
 - Package now owns the directories that it creates.
+
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1
 - Update to new upstream sources.
+
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.0-3
 - Remove dependency on dos2unix with clever sed command.
+
 * Fri Nov 25 2005 Wart <wart at kobold.org> - 3.0-2
 - Fix file permissions to clean up rpmlint warnings.
 - Add BR: dos2unix to remove DOS line endings on a documentation file.
 - Other minor fixes to clean up rpmlint warnings.
+
 * Fri Jun 17 2005 Wart <wart at kobold.org> - 3.0-1
 - Updated spec file to conform to Fedora Core 4 standards.
 - Move autoreconf from the build to the prep stage.
+
 * Tue Jan 18 2005 Wart <wart at kobold.org> - 3.0-0.fdr.5
 - Fix typo in version string for subpackage dependencies.
 - Don't include the .a library in the base package.
+
 * Fri Nov 5 2004 Wart <wart at kobold.org> - 3.0-0.fdr.4
 - Add epoch to version dependencies in spec file.
 - Added additional doc files.
+
 * Thu Nov 4 2004 Wart <wart at kobold.org> - 3.0-0.fdr.3
 - enable building on x86_64
+
 * Thu Nov 4 2004 Wart <wart at kobold.org> - 3.0-0.fdr.2
 - Clean up rpmlint warnings.
+
 * Thu Nov 4 2004 Wart <wart at kobold.org> - 3.0-0.fdr.1
 - Added Fedora-style spec file.
 - Allow building generic RPMs from the Makefile.