switch back to fully versioned subpackage dependencies

add doxygen devel-doc documentation for the shared library
mhorbul · Apr 10, 2009 · 20dfa36 · 20dfa36
1 parent e5b1e3d
commit 20dfa36
Show file tree

Hide file tree

Showing 8 changed files with 1,220 additions and 24 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,8 @@
 LibPST 0.6.36 (2009-04-09)
 ===============================
-    * remove fully versioned -libs dependency from main package.
+    * spec file cleanup with multiple sub packages.
-    * other spec file cleanup
+    * add doxygen devel-doc documentation for the shared library.
+    * switch back to fully versioned subpackage dependencies.
 
 LibPST 0.6.35 (2009-04-08)
 ===============================

diff --git a/Makefile.cvs b/Makefile.cvs
@@ -8,7 +8,7 @@ all:
 	autoheader
 	automake
 	autoconf
-	./configure >/dev/null
+	./configure --enable-libpst-shared >/dev/null
-	rm -rf html.internal
+	#rm -rf html.internal
-	doxygen
+	#doxygen
-	tar cfz libpst.html.tar.gz html.internal
+	#tar cfz libpst.html.tar.gz html.internal
diff --git a/README b/README
@@ -9,7 +9,6 @@ Starting with an unpacked tarball, try this:
 Starting with a mercurial working directory, try this:
 
     make -f *cvs
-    ./configure >/dev/null
     (cd xml; make; make distclean)
     make distcheck
 
diff --git a/debian/libpst-dev.install b/debian/libpst-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/libpst
+debian/tmp/usr/include/libpst*
 debian/tmp/usr/lib/libpst*.so
 debian/tmp/usr/lib/pkgconfig/*
diff --git a/html/Makefile.am b/html/Makefile.am
@@ -1,3 +1,3 @@
 htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@
-html_DATA = $(wildcard *.html) $(wildcard *.pdf)
+html_DATA = $(wildcard *.html) $(wildcard *.pdf) $(wildcard devel/*)
 EXTRA_DIST = $(html_DATA)
diff --git a/libpst.spec.in b/libpst.spec.in
@@ -8,6 +8,7 @@ Source:             http://www.five-ten-sg.com/%{name}/packages/%{name}-%{versio
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL:                http://www.five-ten-sg.com/%{name}/
 Requires:           ImageMagick
+Requires:           %{name}-libs = %{version}-%{release}
 BuildRequires:      ImageMagick freetype-devel gd-devel libjpeg-devel zlib-devel
 
 %description
@@ -23,22 +24,43 @@ Summary:            Shared library used by the pst utilities
 Group:              Development/Libraries
 
 %description libs
-libpst-libs contains the shared library used by the pst utilities.
+The libpst-libs package contains the shared library used by the pst
+utilities.
 
 
 %package devel
 Summary:            Library links and header files for libpst application development
 Group:              Development/Libraries
-Requires:           pkgconfig freetype-devel gd-devel libjpeg-devel zlib-devel
+Requires:           pkgconfig
 Requires:           %{name}-libs = %{version}-%{release}
 
 %description devel
-libpst-devel contains the library links and header files you'll
+The libpst-devel package contains the library links and header files
-need to develop applications using the libpst shared library.
+you'll need to develop applications using the libpst shared library.
 You do not need to install it if you just want to use the libpst
 utilities.
 
 
+%package devel-doc
+Summary:            Documentation for libpst.so for libpst application development
+Group:              Documentation
+Requires:           %{name}-doc = %{version}-%{release}
+
+%description devel-doc
+The libpst-devel-doc package contains the doxygen generated
+documentation for the libpst.so shared library.
+
+
+%package doc
+Summary:            Documentation for the pst utilities in html format
+Group:              Documentation
+
+%description doc
+The libpst-doc package contains the html documentation for the pst
+utilities.  You do not need to install it if you just want to use the
+libpst utilities.
+
+
 
 %prep
 %setup -q
@@ -71,24 +93,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%{_datadir}/doc/%{name}-%{version}/
 
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libpst.so.*
 
 
+%files devel-doc
+%defattr(-,root,root,-)
+%{_datadir}/doc/%{name}-%{version}/devel
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libpst.so
 %{_includedir}/%{name}-@LIBPST_SO_MAJOR@/
 %{_libdir}/pkgconfig/libpst.pc
 
 
+%files doc
+%defattr(-,root,root,-)
+%{_datadir}/doc/%{name}-%{version}/
+
+
+
 %changelog
 * Thu Apr 09 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.36-1
-- remove fully versioned -libs dependency from main package.
+- change to >= for -libs dependency from the main package.
+- add -doc subpackage.
 - other spec file cleanup
 
 * Wed Apr 08 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.35-1