[libmspack/f12/master] - updated to 0.2alpha released 2010/07/23 - merged the doc subpackage with devel

[Dan Horák]

commit 909dc1095cbd74e2aadb6213be74983def828123
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 13 10:52:09 2010 +0200

    - updated to 0.2alpha released 2010/07/23
    - merged the doc subpackage with devel

 .gitignore                   |    1 +
 libmspack-0.2alpha-doc.patch |   14 ++++++++++
 libmspack.spec               |   59 +++++++++++++++++------------------------
 sources                      |    2 +-
 4 files changed, 41 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e47171..8b26ee1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libmspack-0.0.20060920alpha.tar.gz
+/libmspack-0.2alpha.tar.gz
diff --git a/libmspack-0.2alpha-doc.patch b/libmspack-0.2alpha-doc.patch
new file mode 100644
index 0000000..d012612
--- /dev/null
+++ b/libmspack-0.2alpha-doc.patch
@@ -0,0 +1,14 @@
+diff -up libmspack-0.2alpha/doc/Doxyfile.in.orig libmspack-0.2alpha/doc/Doxyfile.in
+--- libmspack-0.2alpha/doc/Doxyfile.in.orig	2010-08-30 10:31:08.000000000 +0200
++++ libmspack-0.2alpha/doc/Doxyfile.in	2010-08-30 10:31:15.000000000 +0200
+@@ -10,9 +10,8 @@ SHOW_USED_FILES        = YES
+ INPUT                  = @top_srcdir@/mspack/mspack.h
+ FULL_PATH_NAMES        = NO
+ OPTIMIZE_FOR_C         = YES
+-12a15
+ GENERATE_HTML          = YES
+-HTML_OUTPUT            = .
++HTML_OUTPUT            = html
+ HTML_FILE_EXTENSION    = .html
+ HTML_TIMESTAMP         = NO
+ GENERATE_HTMLHELP      = NO
diff --git a/libmspack.spec b/libmspack.spec
index d6ef6c3..311f0af 100644
--- a/libmspack.spec
+++ b/libmspack.spec
@@ -1,13 +1,15 @@
 Name:           libmspack
-Version:        0.0
-Release:        0.7.20060920alpha%{?dist}
+Version:        0.2
+Release:        0.1.20100723alpha%{?dist}
 Summary:        Library for CAB and related files compression and decompression
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.cabextract.org.uk/libmspack/
-Source0:        http://www.cabextract.org.uk/libmspack/libmspack-0.0.20060920alpha.tar.gz
+Source0:        http://www.cabextract.org.uk/libmspack/%{name}-%{version}alpha.tar.gz
+Patch0:         %{name}-0.2alpha-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  doxygen
 
 
 %description
@@ -18,25 +20,20 @@ some loosely related file formats used by Microsoft.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Obsoletes:      %{name}-doc < 0.2
 
 %description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+The %{name}-devel package contains libraries, header files and documentation
+for developing applications that use %{name}.
 
 
-%package        doc
-Summary:        Documentation files for %{name}
-Group:          Documentation
-
-
-%description    doc
-The %{name}-doc package contains the documentation for developing
-applications using %{name}-devel.
-
 %prep
-%setup -q -n libmspack-0.0.20060920alpha
+%setup -q -n %{name}-%{version}alpha
+%patch0 -p1
+
 chmod a-x mspack/mspack.h
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -51,14 +48,12 @@ iconv -f ISO_8859-1 -t utf8 ChangeLog --output Changelog.utf8
 touch -r ChangeLog Changelog.utf8
 mv Changelog.utf8 ChangeLog
 
-# install the html documentation in the main package directory
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
-install -p -m 0644 doc/*.html doc/*.gif doc/*.png doc/*.css \
-   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
-# install also the main package documentation files manually since
-# %%doc isn't used for these files
-install -p -m 0644 README TODO COPYING.LIB ChangeLog AUTHORS \
-    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+pushd doc
+doxygen
+find html -type f | xargs touch -r %{SOURCE0}
+rm -f html/installdox
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,26 +66,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}/
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/TODO
-%doc %{_docdir}/%{name}-%{version}/COPYING.LIB
-%doc %{_docdir}/%{name}-%{version}/ChangeLog
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc README TODO COPYING.LIB ChangeLog AUTHORS
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc 
+%doc doc/html
 %{_includedir}/*
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 
-%files doc
-%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}/
-%doc %{_docdir}/%{name}-%{version}/html/
 
 %changelog
+* Mon Aug 30 2010 Dan Horák <dan[at]danny.cz> - 0.2-0.1.20100723alpha
+- updated to 0.2alpha released 2010/07/23
+- merged the doc subpackage with devel
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0-0.7.20060920alpha
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 5ba8fb6..b7b0c35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72003dfa5da2e843e3d5ae0c18f7c969  libmspack-0.0.20060920alpha.tar.gz
+a51c65ba1dc9b53090d4e65e1f55d860  libmspack-0.2alpha.tar.gz