[openscad/nightly] Prepare for nighlty builds
Miro Hrončok
churchyard at fedoraproject.org
Mon Jun 30 13:44:05 UTC 2014
commit f29ad7d3df576b216394ef2f4e1ecb07ffa2b20c
Author: Miro Hrončok <miro at hroncok.cz>
Date: Mon Jun 30 15:43:04 2014 +0200
Prepare for nighlty builds
openscad-desktop-valid.patch | 23 -------
openscad.spec | 134 ++++++++++++++++++++++++++---------------
2 files changed, 85 insertions(+), 72 deletions(-)
---
diff --git a/openscad.spec b/openscad.spec
index 5d859e3..df19ab4 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -1,27 +1,29 @@
Name: openscad
-%global shortversion 2014.03
+%global shortversion %(date +%Y).%(date +%m)
Version: %{shortversion}
-Release: 4%{?dist}
+Release: 0.10.20140628git9fdc44b0%{?dist}
Summary: The Programmers Solid 3D CAD Modeller
# COPYING contains a linking exception for CGAL
-# AppData is CC0
+# Appdata file is CC0
License: GPLv2 with exceptions and CC0
Group: Applications/Engineering
URL: http://www.openscad.org/
-Source0: http://files.openscad.org/openscad-%{shortversion}.src.tar.gz
-# https://github.com/openscad/openscad/pull/698
-Patch0: %{name}-desktop-valid.patch
+Source0: openscad-devel-9fdc44b0.tar
+Source1: MCAD-master.zip
BuildRequires: CGAL-devel >= 3.6
BuildRequires: ImageMagick
BuildRequires: Xvfb
BuildRequires: bison >= 2.4
-BuildRequires: boost-devel >= 1.3.5
+BuildRequires: boost-devel >= 1.35
BuildRequires: desktop-file-utils
BuildRequires: eigen3-devel
BuildRequires: flex >= 2.5.35
+BuildRequires: freetype-devel >= 2.4
+BuildRequires: fontconfig-devel >= 2.10
BuildRequires: glew-devel >= 1.6
BuildRequires: glib2-devel
BuildRequires: gmp-devel >= 5.0.0
+BuildRequires: harfbuzz-devel >= 0.9.19
BuildRequires: mesa-dri-drivers
BuildRequires: mpfr-devel >= 3.0.0
BuildRequires: opencsg-devel >= 1.3.2
@@ -39,8 +41,9 @@ parts but pretty sure is not what you are looking for when you are more
interested in creating computer-animated movies.
%prep
-%setup -qn %{name}-%{shortversion}
-%patch0 -p1
+%setup -qa1 -Tcn %{name}-devel/libraries
+mv MCAD{-master,}
+%setup -Dqn %{name}-devel
%build
qmake-qt4 VERSION=%{shortversion} PREFIX=%{_prefix}
@@ -48,15 +51,13 @@ make %{?_smp_mflags}
# tests
cd tests
-cmake .
+OPENSCAD_UPLOAD_TESTS=yes cmake .
make %{?_smp_mflags}
cd -
%install
make install INSTALL_ROOT=%{buildroot}
-# remove MCAD (separated package)
-rm -rf %{buildroot}%{_datadir}/%{name}/libraries/MCAD
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -64,10 +65,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
# tests
cd tests
ctest %{?_smp_mflags} -C All || : # let the tests fail, as they probably won't work in Koji
-cat sysinfo.txt || :
-cat Testing/Temporary/LastTest.log || :
cd -
+# remove MCAD (separate package) after the tests
+rm -rf %{buildroot}%{_datadir}/%{name}/libraries/MCAD
+
%files
%doc COPYING README.md RELEASE_NOTES
%attr(755,root,root) %{_bindir}/%{name}
@@ -78,61 +80,95 @@ cd -
%endif
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/mime/packages/%{name}.xml
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/examples
%dir %{_datadir}/%{name}/libraries
%{_mandir}/man1/*
%changelog
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.03-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+* Sat Jun 28 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.06-0.10.20140628git9fdc44b0
+- Update to git: 9fdc44b0
-* Fri May 23 2014 David Tardon <dtardon at redhat.com> - 2014.03-3
-- rebuild for boost 1.55.0
+* Wed Jun 25 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.06-0.9.20140625gitd9fda460
+- Update to git: d9fda460
-* Thu May 22 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.03-2
-- Rebuilt for opencsg 1.3.3
+* Mon Jun 23 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.06-0.8.20140623git681f03a2
+- Update to git: 681f03a2
-* Sun Mar 09 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.03-1
-- New version
+* Wed Jun 18 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.7.20140618git48e1d6a5
+- Update to git: 48e1d6a5
+
+* Tue Jun 10 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.6.20140610git05e2a1ed
+- Update to git: 05e2a1ed
+
+* Sun Jun 08 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.5.20140608gitdb22a019
+- Update to git: db22a019
+
+* Fri Jun 06 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.4.20140606gitacd6cb1a
+- Update to git: acd6cb1a
+
+* Wed Jun 04 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.3.20140604git78803bfe
+- Update to git: 78803bfe
-* Fri Dec 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-8
-- Enable Xvfb tests
-- Add AppData from upstream git
+* Fri May 30 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.2.20140530gitca3ff7cf
+- Update to git: ca3ff7cf
-* Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 2013.06-7
-- rebuilt for GLEW 1.10
+* Thu May 29 2014 Miro Hrončok <mhroncok at redhat.com> - %{shortversion}-0.1.20140529git380af79b
+- Update to git: 380af79b
-* Sun Nov 17 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-6
-- Rebuilt for new glew
+* Mon Mar 03 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.03-0.1.201400303git8635e94
+- Latest RC
-* Fri Sep 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-5
-- Require Python for tests
+* Fri Feb 28 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.02-0.4.20140228gitb2fbad4
+- 2014.03 RC new commits
-* Fri Sep 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-4
-- Patch to solve upstream bug #482
+* Thu Feb 27 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.02-0.3.20140227gitbc86c49
+- 2014.03 RC new commits
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.06-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Wed Feb 26 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.02-0.2.20140225git341571c
+- 2014.03 RC
-* Sun Jul 28 2013 Petr Machata <pmachata at redhat.com> - 2013.06-2
-- Rebuild for boost 1.54.0
+* Sat Feb 22 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.02-0.1.20140222git6867c50
+- New commit
-* Wed Jun 19 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-1
-- New upstream release
-- Moved removing MCAD to %%install
+* Wed Jan 29 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.01-0.3.20140127git41f4575
+- New commit
+- Upload test results
+- Don't cat the results to the log
-* Sat Feb 23 2013 Kevin Fenzi <kevin at scrye.com> - 2013.01.17-6
-- Rebuild for broken deps in rawhide
+* Mon Jan 27 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.01-0.2.20140124gitd9432d7
+- New commit
-* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2013.01.17-5
-- Rebuild for Boost-1.53.0
+* Sun Jan 12 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.01-0.1.20140108gite6bfee0
+- New commit
+- New month
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2013.01.17-4
-- Rebuild for Boost-1.53.0
+* Mon Dec 30 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.12-0.6.20131229gitbf19347
+- New commit
-* Sun Feb 03 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.01.17-3
-- Added fix for issue 267
+* Tue Dec 24 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.12-0.5.20131223git41ab9e8
+- New commit
+- Manpage and appdata now installed with make install
+
+* Mon Dec 23 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.12-0.4.20131217git6938ae2
+- Include appdata in the RPM
+
+* Thu Dec 19 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.12-0.3.20131217git6938ae2
+- Development version
+
+* Tue Dec 17 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.12-0.2.20131215gite64bf96
+- Development version
+- Added BRs for virtual framebuffer
+
+* Tue Oct 29 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.10-0.1.20131029git8aa749f
+- Development version
+
+* Fri Jun 07 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-0.1rc1
+- New version RC
+
+* Sun Jan 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.01.17-3
+- Use Xvfb
* Tue Jan 22 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.01.17-2
- Using source tarball
@@ -170,6 +206,6 @@ cd -
* Mon Oct 08 2012 Miro Hrončok <miro at hroncok.cz> 2012.10-1
- New version.
-
* Sun Oct 07 2012 Miro Hrončok <miro at hroncok.cz> 2012.08-1
+
- New package.
More information about the scm-commits
mailing list