rpms/libzzub/F-7 libzzub.spec,1.3,1.4
Alexander Kahl (akahl)
fedora-extras-commits at redhat.com
Thu Oct 25 08:57:12 UTC 2007
Author: akahl
Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4928/F-7
Modified Files:
libzzub.spec
Log Message:
fixed multiarch conflict
Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libzzub.spec 21 Sep 2007 13:12:47 -0000 1.3
+++ libzzub.spec 25 Oct 2007 08:56:39 -0000 1.4
@@ -1,6 +1,6 @@
Name: libzzub
Version: 0.2.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Powerful music sequencing library
Group: System Environment/Libraries
@@ -97,6 +97,26 @@
%{__rm} -rf $RPM_BUILD_ROOT
scons install CCFLAGS="%{optflags}"
+# signature.h differs per build host, circumvent multiarch conflicts
+%{__mv} $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h \
+%ifarch x86_64 ppc64
+ $RPM_BUILD_ROOT%{_includedir}/zzub/signature-64.h
+%else
+ $RPM_BUILD_ROOT%{_includedir}/zzub/signature-32.h
+%endif
+
+cat > $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h << EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "signature-32.h"
+#elseif __WORDSIZE == 64
+#include "signature-64.h"
+#else
+#error "Unknown word size"
+#endif
+EOF
+
cd src/pyzzub
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
@@ -130,6 +150,9 @@
%{python_sitelib}/zzub
%changelog
+* Thu Oct 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-9
+- fixed multiarch conflict
+
* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
- included patch to install missing documentation to the right place
- removed move macro instead
More information about the fedora-extras-commits
mailing list