rpms/libisofs/devel libisofs-0.6.16-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libisofs.spec, 1.10, 1.11 sources, 1.5, 1.6

[Robert Scheck]

Author: robert

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

Modified Files:
	.cvsignore libisofs.spec sources 
Added Files:
	libisofs-0.6.16-multilib.patch 
Log Message:
- Upgrade to 0.6.16
- Several spec file cleanups and solved the multilib issues


libisofs-0.6.16-multilib.patch:

--- NEW FILE libisofs-0.6.16-multilib.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libisofs >= 0.6.16, which solves the
multilib/multiarch problem by removing the timestamp within the footer from the doxygen
generated files.

--- libisofs-0.6.16/doc/doxygen.conf.in				2008-11-25 11:00:11.000000000 +0100
+++ libisofs-0.6.16/doc/doxygen.conf.in.multilib		2009-03-17 22:17:03.000000000 +0100
@@ -694,7 +694,7 @@
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            = doc/footer_no_timestamp.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
--- libisofs-0.6.16/doc/footer_no_timestamp.html		1970-01-01 01:00:00.000000000 +0100
+++ libisofs-0.6.16/doc/footer_no_timestamp.html.multilib	2009-03-17 22:18:47.000000000 +0100
@@ -0,0 +1,5 @@
+<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by 
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion </small></address>
+</body>
+</html>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2009 09:39:09 -0000	1.5
+++ .cvsignore	17 Mar 2009 21:53:09 -0000	1.6
@@ -1 +1 @@
-libisofs-0.6.12.tar.gz
+libisofs-0.6.16.tar.gz


Index: libisofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/libisofs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libisofs.spec	25 Feb 2009 15:56:52 -0000	1.10
+++ libisofs.spec	17 Mar 2009 21:53:09 -0000	1.11
@@ -1,61 +1,55 @@
-Name:           libisofs
-Version:        0.6.12
-Release:        2%{?dist}
-Summary:        Library to create ISO 9660 disk images
-
-Group:          System Environment/Libraries
-License:        GPLv2
-URL:            http://libburnia-project.org/
-Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libburn-devel doxygen graphviz
-Requires:       libburn >= 0.4.0
-
+Summary:	Library to create ISO 9660 disk images
+Name:		libisofs
+Version:	0.6.16
+Release:	1%{?dist}
+License:	GPLv2
+Group:		System Environment/Libraries
+URL:		http://libburnia-project.org/
+Source:		http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
+Patch0:		libisofs-0.6.16-multilib.patch
+BuildRequires:	doxygen, graphviz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Libisofs is a library to pack up hard disk files and directories into a
-ISO 9660 disk image. This may then be burned to CD via libburn.
-
+Libisofs is a library to create an ISO-9660 filesystem and supports
+extensions like RockRidge or Joliet. It is also a full featured
+ISO-9660 editor, allowing you to modify an ISO image or multisession
+disc, including file addition or removal, change of file names and
+attributes etc. It supports the extension AAIP which allows to store
+ACLs and xattr in ISO-9660 filesystems as well.
+
+%package devel
+Summary:	Development files for libisofs
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}, pkgconfig
 
-%package        devel
-Summary:        Development files for libisofs
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-
-%description    devel
+%description devel
 The libisofs-devel package contains libraries and header files for
 developing applications that use libisofs.
 
-
 %prep
 %setup -q
-
+%patch0 -p1 -b .multilib
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 doxygen doc/doxygen.conf
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
-install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
+# Don't install any libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT README NEWS
@@ -65,11 +59,14 @@
 %defattr(-,root,root,-)
 %doc doc/html
 %{_includedir}/%{name}
-%{_libdir}/libisofs*.so
-%{_libdir}/pkgconfig/libisofs*.pc
- 
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}*.pc
 
 %changelog
+* Tue Mar 17 2009 Robert Scheck <robert at fedoraproject.org> 0.6.16-1
+- Upgrade to 0.6.16
+- Several spec file cleanups and solved the multilib issues
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2009 09:39:10 -0000	1.5
+++ sources	17 Mar 2009 21:53:09 -0000	1.6
@@ -1 +1 @@
-bbf94852dc019ff21a711805bcd0af2d  libisofs-0.6.12.tar.gz
+398d934b5ca0e2741a6aa3c28ecef5b1  libisofs-0.6.16.tar.gz