Permalink
Browse files

switch back to fully versioned subpackage dependencies

add doxygen devel-doc documentation for the shared library
  • Loading branch information...
1 parent e5b1e3d commit 20dfa3655ddeb1004686c5aed4bff374e0e5b354 Carl Byington committed Apr 10, 2009
Showing with 1,220 additions and 24 deletions.
  1. +3 −2 ChangeLog
  2. +4 −4 Makefile.cvs
  3. +0 −1 README
  4. +1 −1 debian/libpst-dev.install
  5. +1 −1 html/Makefile.am
  6. +39 −6 libpst.spec.in
  7. +1,161 −0 xml/Doxyfile
  8. +11 −9 xml/Makefile.am
View
@@ -1,7 +1,8 @@
LibPST 0.6.36 (2009-04-09)
===============================
- * remove fully versioned -libs dependency from main package.
- * other spec file cleanup
+ * spec file cleanup with multiple sub packages.
+ * add doxygen devel-doc documentation for the shared library.
+ * switch back to fully versioned subpackage dependencies.
LibPST 0.6.35 (2009-04-08)
===============================
View
@@ -8,7 +8,7 @@ all:
autoheader
automake
autoconf
- ./configure >/dev/null
- rm -rf html.internal
- doxygen
- tar cfz libpst.html.tar.gz html.internal
+ ./configure --enable-libpst-shared >/dev/null
+ #rm -rf html.internal
+ #doxygen
+ #tar cfz libpst.html.tar.gz html.internal
View
1 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
@@ -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/*
View
@@ -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)
View
@@ -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
-need to develop applications using the libpst shared library.
+The libpst-devel package contains the library links and header files
+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
Oops, something went wrong.

0 comments on commit 20dfa36

Please sign in to comment.