- Update to upstream 1.3.0 (#965231)

- Run autoreconf to recognize aarch64 (#925679)
This commit is contained in:
Robert Scheck 2013-08-03 18:28:31 +02:00
parent f3618a5239
commit b7d77e4c13
5 changed files with 56 additions and 48 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
libburn-1.?.?.tar.gz libburn-1.?.?.tar.gz
/libburn-1.3.0.pl01.tar.gz

View File

@ -0,0 +1,23 @@
Patch by Robert Scheck <robert@fedoraproject.org> 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 @@
+<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion </small></address>
+</body>
+</html>

View File

@ -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

View File

@ -1,37 +1,34 @@
Name: libburn
Version: 1.2.8
Release: 3%{?dist}
Summary: Library for reading, mastering and writing optical discs Summary: Library for reading, mastering and writing optical discs
Name: libburn
Group: System Environment/Libraries Version: 1.3.0
Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries
URL: http://libburnia-project.org/ URL: http://libburnia-project.org/
Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.pl01.tar.gz
Patch0: libburn-multilib_doc.patch 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool intltool gettext doxygen graphviz
%description %description
Libburn is an open-source library for reading, mastering and writing Libburn is a library by which preformatted data get onto optical media:
optical discs. For now this means only CD-R and CD-RW. 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
The project comprises of several more or less interdependent parts which has advantages and disadvantages. It seems appropriate, nevertheless,
together strive to be a usable foundation for application development. to do writing and reading via same channel. On several Linux systems,
These are libraries, language bindings, and middleware binaries which emulate the block device driver needs reloading of the drive tray in order to
classical (and valuable) Linux tools. 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 %package devel
Summary: Development files for %{name} Summary: Development files for libburn
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig
%description devel %description devel
The %{name}-devel package contains libraries and header files for The libburn-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use libburn.
%package -n cdrskin %package -n cdrskin
Summary: Limited cdrecord compatibility wrapper to ease migration to libburn 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 A limited cdrecord compatibility wrapper which allows to use some libburn
features from the command line. features from the command line.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .multilibdoc %patch0 -p1 -b .multilib
echo "<!-- empty html footer do defeat multilib conflicts - do not insert current time -->" > doc/empty_footer.html autoreconf --force --install
#overwrite old autoconf scripts which do not recognize aarch64
autoreconf -vfi
%build %build
%configure --disable-static %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} make %{?_smp_mflags}
doxygen doc/doxygen.conf doxygen doc/doxygen.conf
%install %install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
# Don't install any libtool .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING COPYRIGHT README %doc AUTHORS COPYING COPYRIGHT README
%{_libdir}/%{name}*.so.* %{_libdir}/%{name}*.so.*
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc doc/html
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/%{name}*.so %{_libdir}/%{name}*.so
%{_libdir}/pkgconfig/%{name}*.pc %{_libdir}/pkgconfig/%{name}*.pc
%doc doc/html
%files -n cdrskin %files -n cdrskin
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_mandir}/*/* %{_mandir}/*/*
%{_bindir}/cdrskin %{_bindir}/cdrskin
%changelog %changelog
* Sat Aug 03 2013 Robert Scheck <robert@fedoraproject.org> 1.3.0-1
- Update to upstream 1.3.0 (#965231)
- Run autoreconf to recognize aarch64 (#925679)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-3 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
2838ff6fdd32e69394305f97f806002b libburn-1.2.8.tar.gz 1ccbb8624b8c2b9937727000e46b52cf libburn-1.3.0.pl01.tar.gz