rpms/jack-audio-connection-kit/F-10 jack-audio-connection-kit-no_date_footer.html, NONE, 1.1 jack-audio-connection-kit.spec, 1.25, 1.26

Andy Shevchenko andriy at fedoraproject.org
Mon Dec 29 22:03:45 UTC 2008


Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11760

Modified Files:
	jack-audio-connection-kit.spec 
Added Files:
	jack-audio-connection-kit-no_date_footer.html 
Log Message:
Fix multiarch conflicts again (#477718)


--- NEW FILE jack-audio-connection-kit-no_date_footer.html ---
<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: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-10/jack-audio-connection-kit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jack-audio-connection-kit.spec	15 Dec 2008 18:52:48 -0000	1.25
+++ jack-audio-connection-kit.spec	29 Dec 2008 22:03:15 -0000	1.26
@@ -1,12 +1,13 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.116.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
 Source2: %{name}-script.pa
+Source3: %{name}-no_date_footer.html
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -24,6 +25,9 @@
 Requires(post): /sbin/ldconfig
 Requires(post): pam
 
+# To fix multilib conflicts take a basepoint as following
+%define doxyfile	doc/reference.doxygen.in
+
 %description
 JACK is a low-latency audio server, written primarily for the Linux
 operating system. It can connect a number of different applications to
@@ -57,6 +61,14 @@
 %prep
 %setup -q
 
+# Put custom HTML_FOOTER to avoid timestamp inside
+# (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks)
+cp %{SOURCE3} doc/no_date_footer.html
+# Fix Doxyfile - apply custom html footer
+sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,' %{doxyfile} > %{doxyfile}.new
+touch -r %{doxyfile} %{doxyfile}.new
+mv -f %{doxyfile}.new %{doxyfile}
+
 %build
 # x86_64 issue reported by Rudolf Kastl (not checked, but not bad).
 autoreconf --force --install
@@ -90,7 +102,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Fix timestamps to avoid multiarch conflicts
-find doc/reference -type f | xargs touch -r doc/reference.doxygen.in
+find doc/reference -type f | xargs touch -r %{doxyfile}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,6 +173,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Mon Dec 29 2008 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-2
+- fix multiarch conflict again (#477718, #341621)
+
 * Sun Dec 14 2008 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-1
 - update to last official release
 - update URL tag




More information about the fedora-extras-commits mailing list