diff --git a/.gitignore b/.gitignore index 2e6afa0..8c1dc46 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libburn-1.?.?.tar.gz +/libburn-1.3.0.pl01.tar.gz diff --git a/libburn-0.6.16-multilib.patch b/libburn-0.6.16-multilib.patch new file mode 100644 index 0000000..7ce2c7e --- /dev/null +++ b/libburn-0.6.16-multilib.patch @@ -0,0 +1,23 @@ +Patch by Robert Scheck for libburn >= 0.6.16, which solves the +multilib/multiarch problem by removing the timestamp within the footer from the doxygen +generated files. + +--- libburn-0.6.16/doc/doxygen.conf.in 2008-11-25 11:00:11.000000000 +0100 ++++ libburn-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 +--- libburn-0.6.16/doc/footer_no_timestamp.html 1970-01-01 01:00:00.000000000 +0100 ++++ libburn-0.6.16/doc/footer_no_timestamp.html.multilib 2009-03-17 22:18:47.000000000 +0100 +@@ -0,0 +1,5 @@ ++
Generated for $projectname by  ++ ++doxygen $doxygenversion
++ ++ diff --git a/libburn-multilib_doc.patch b/libburn-multilib_doc.patch deleted file mode 100644 index b3c7038..0000000 --- a/libburn-multilib_doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libburn-1.2.4/doc/doxygen.conf.in.backup libburn-1.2.4/doc/doxygen.conf.in ---- libburn-1.2.4/doc/doxygen.conf.in.backup 2012-12-04 10:40:27.075353301 +0100 -+++ libburn-1.2.4/doc/doxygen.conf.in 2012-12-04 10:40:53.833494434 +0100 -@@ -689,7 +689,7 @@ HTML_HEADER = - # each generated HTML page. If it is left blank doxygen will generate a - # standard footer. - --HTML_FOOTER = -+HTML_FOOTER = doc/empty_footer.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 diff --git a/libburn.spec b/libburn.spec index ea08007..3e49777 100644 --- a/libburn.spec +++ b/libburn.spec @@ -1,37 +1,34 @@ -Name: libburn -Version: 1.2.8 -Release: 3%{?dist} Summary: Library for reading, mastering and writing optical discs - -Group: System Environment/Libraries +Name: libburn +Version: 1.3.0 +Release: 1%{?dist} License: GPLv2+ +Group: System Environment/Libraries URL: http://libburnia-project.org/ -Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz -Patch0: libburn-multilib_doc.patch +Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.pl01.tar.gz +Patch0: libburn-0.6.16-multilib.patch +BuildRequires: intltool, gettext, doxygen, graphviz +BuildRequires: autoconf, automake, libtool, pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtool intltool gettext doxygen graphviz - - %description -Libburn is an open-source library for reading, mastering and writing -optical discs. For now this means only CD-R and CD-RW. - -The project comprises of several more or less interdependent parts which -together strive to be a usable foundation for application development. -These are libraries, language bindings, and middleware binaries which emulate -classical (and valuable) Linux tools. - +Libburn is a library by which preformatted data get onto optical media: +CD, DVD and BD (Blu-Ray). It also offers a facility for reading data +blocks from its drives without using the normal block device I/O, which +has advantages and disadvantages. It seems appropriate, nevertheless, +to do writing and reading via same channel. On several Linux systems, +the block device driver needs reloading of the drive tray in order to +make available freshly written data. The libburn read function does not +need such a reload. The code of libburn is independent of cdrecord. %package devel -Summary: Development files for %{name} +Summary: Development files for libburn Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig %description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - +The libburn-devel package contains libraries and header files for +developing applications that use libburn. %package -n cdrskin Summary: Limited cdrecord compatibility wrapper to ease migration to libburn @@ -42,53 +39,52 @@ Requires: %{name}%{?_isa} = %{version}-%{release} A limited cdrecord compatibility wrapper which allows to use some libburn features from the command line. - %prep %setup -q -%patch0 -p1 -b .multilibdoc -echo "" > doc/empty_footer.html -#overwrite old autoconf scripts which do not recognize aarch64 -autoreconf -vfi +%patch0 -p1 -b .multilib +autoreconf --force --install %build %configure --disable-static -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} doxygen doc/doxygen.conf - %install +rm -rf $RPM_BUILD_ROOT 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 %{_libdir}/%{name}*.so.* - %files devel %defattr(-,root,root,-) +%doc doc/html %{_includedir}/%{name} %{_libdir}/%{name}*.so %{_libdir}/pkgconfig/%{name}*.pc -%doc doc/html %files -n cdrskin %defattr(-,root,root,-) %{_mandir}/*/* %{_bindir}/cdrskin - %changelog +* Sat Aug 03 2013 Robert Scheck 1.3.0-1 +- Update to upstream 1.3.0 (#965231) +- Run autoreconf to recognize aarch64 (#925679) + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index c668553..d446fc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2838ff6fdd32e69394305f97f806002b libburn-1.2.8.tar.gz +1ccbb8624b8c2b9937727000e46b52cf libburn-1.3.0.pl01.tar.gz