[packages/openscad] pldize
glen
glen at pld-linux.org
Thu Apr 30 17:32:57 CEST 2015
commit 2d0b26993f291e2e1aa3b222918facf2d5f00391
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Apr 30 18:32:47 2015 +0300
pldize
openscad.spec | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/openscad.spec b/openscad.spec
index 5738830..1e8029c 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -122,7 +122,9 @@ Summary: OpenSCAD Parametric CAD Library
License: LGPLv2+ and LGPLv2 and LGPLv3+ and (GPLv3 or LGPLv2) and (GPLv3+ or LGPLv2) and (CC-BY-SA or LGPLv2+) and (CC-BY-SA or LGPLv2) and CC-BY and BSD and MIT and Public Domain
URL: https://www.github.com/openscad/MCAD
Requires: %{name} = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
BuildArch: noarch
+%endif
%description MCAD
This library contains components commonly used in designing and
@@ -133,7 +135,8 @@ expect some API changes, however many things are already working.
%setup -qn %{name}-%{upversion}
%patch0 -p1
-rm -rf src/polyclipping
+# use system package
+rm -r src/polyclipping
%build
qmake-qt4 \
@@ -144,17 +147,15 @@ qmake-qt4 \
cd tests
install -d build
cd build
-%{__cmake} ..
+%cmake ..
%{__make}
-cd ../..
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} -j1 install \
INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
+rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
:> %{name}.lang
# TODO: fix this to find the files
@@ -170,6 +171,9 @@ ctest
cd ..
%endif
+%clean
+rm -rf $RPM_BUILD_ROOT
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README.md RELEASE_NOTES
@@ -191,8 +195,3 @@ cd ..
%defattr(644,root,root,755)
%doc libraries/MCAD/README.markdown libraries/MCAD/TODO
%{_datadir}/%{name}/libraries/MCAD
-
-%changelog
-
-%clean
-rm -rf $RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openscad.git/commitdiff/2d0b26993f291e2e1aa3b222918facf2d5f00391
More information about the pld-cvs-commit
mailing list