rpms/libp11/devel .cvsignore, 1.3, 1.4 libp11.spec, 1.11, 1.12 sources, 1.3, 1.4

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20511

Modified Files:
	.cvsignore libp11.spec sources 
Log Message:
Update to 0.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Dec 2007 16:56:10 -0000	1.3
+++ .cvsignore	22 Aug 2009 19:16:28 -0000	1.4
@@ -1 +1 @@
-libp11-0.2.3.tar.gz
+libp11-0.2.6.tar.gz


Index: libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/libp11.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libp11.spec	21 Aug 2009 14:20:35 -0000	1.11
+++ libp11.spec	22 Aug 2009 19:16:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libp11
-Version:        0.2.3
-Release:        8%{?dist}
+Version:        0.2.6
+Release:        1%{?dist}
 Summary:        Library for using PKCS#11 modules
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@ URL:            http://www.opensc-projec
 Source0:        http://www.opensc-project.org/files/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  doxygen graphviz
 BuildRequires:  openssl-devel pkgconfig libtool-ltdl-devel
 
 %description
@@ -28,12 +29,21 @@ Files for developing with %{name}
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-doc --enable-api-doc
 make %{?_smp_mflags}
 
+# Remove CRLF line endings
+sed -i "s|\r||g" doc/nonpersistent/wiki.out/trac.css
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+# Use %%doc to install documentation in a standard location
+mkdir __docdir
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/{api,wiki}/ __docdir/
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/README __docdir/wiki
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,12 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc doc/README doc/ChangeLog doc/*.html doc/*.css COPYING 
+%doc COPYING NEWS __docdir/wiki
 %{_libdir}/libp11.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples doc/api
+%doc examples __docdir/api
 %exclude %{_libdir}/*.la
 %{_libdir}/libp11.so
 %{_libdir}/pkgconfig/*
@@ -57,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-1
+- Update to 0.2.6
+- Enable building documentation with doxygen
+- Use INSTALL="install -p" to preserve timestamps
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-8
 - rebuilt with new openssl
 
@@ -82,12 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 - Update to latest upstream sources
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.2.2-7
- - Rebuild for deps
+- Rebuild for deps
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.2.2-6
 - Rebuild for selinux ppc32 issue.
 
-
 * Thu Jun 28 2007 Matt Anderson <mra at hp.com> - 0.2.2-5
 - Additional suggestions by tibbs at math.uh.edu, Source0 URL and license in docs
 
@@ -103,4 +117,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Jun 20 2007 Matt Anderson <mra at hp.com> - 0.2.2-1
 - Initial RPM packaging
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Dec 2007 16:56:10 -0000	1.3
+++ sources	22 Aug 2009 19:16:28 -0000	1.4
@@ -1 +1 @@
-28ee2fc73fd82fbaa4a0670c972ca191  libp11-0.2.3.tar.gz
+4ef3471cfabf787e50c7ae9456f7b09b  libp11-0.2.6.tar.gz