commit dbabdb9b1c8b27bfdb0f4b1d4c31f3250a82987a
Author: Elan Ruusamäe <[email protected]>
Date: Thu Sep 26 15:25:03 2013 +0300
lib64 fix, force our cflags/cxxflags
mypaint.spec | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/mypaint.spec b/mypaint.spec
index 6ba2c20..19072d6 100644
--- a/mypaint.spec
+++ b/mypaint.spec
@@ -19,6 +19,7 @@ BuildRequires: python-pygobject-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(find_lang) >= 1.32
BuildRequires: scons
+BuildRequires: sed >= 4.0
BuildRequires: swig-python
Requires: desktop-file-utils
Requires: gtk-update-icon-cache
@@ -42,14 +43,31 @@ ukrywania interfejsu użytkownika.
%prep
%setup -q
+%{__sed} -i -e "
+ # set our cflags
+ s/'-O3'/'%{rpmcflags}'/
+
+ # lib64 fix
+ s,prefix/lib/mypaint,prefix/%{_lib}/mypaint,
+" SConscript SConstruct
+
+%{__sed} -i -e "
+ /@LIBDIR@/ s/'lib'/'%{_lib}'/
+ s,prefix/lib,prefix/%{_lib},
+" brushlib/SConscript
+
%build
-%scons
+%scons \
+ prefix=$RPM_BUILD_ROOT%{_prefix}
%install
rm -rf $RPM_BUILD_ROOT
%scons install \
prefix=$RPM_BUILD_ROOT%{_prefix}
+# scons as always sucks and doesn't set +x bit
+chmod +x $RPM_BUILD_ROOT%{_libdir}/mypaint/_mypaintlib.so
+
# not packaged
%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/libmypaint
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmypaint.a
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mypaint.git/commitdiff/dbabdb9b1c8b27bfdb0f4b1d4c31f3250a82987a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
