Author: glen Date: Mon Mar 12 01:35:49 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- use prebuilt tarball; rel 2
---- Files affected:
SPECS:
openoffice.org-openclipart.spec (1.1.2.7 -> 1.1.2.8)
---- Diffs:
================================================================
Index: SPECS/openoffice.org-openclipart.spec
diff -u SPECS/openoffice.org-openclipart.spec:1.1.2.7
SPECS/openoffice.org-openclipart.spec:1.1.2.8
--- SPECS/openoffice.org-openclipart.spec:1.1.2.7 Sun Mar 11 17:46:08 2007
+++ SPECS/openoffice.org-openclipart.spec Mon Mar 12 02:35:44 2007
@@ -1,15 +1,24 @@
# $Revision$, $Date$
# TODO
# - remove use of Xvfb
+# - building on ac builders hungs
+#
+# Conditional build:
+%bcond_without tarball # don't use tarball, build gallery
+#
Summary: OpenOffice.org clipart from openclipart
Name: openoffice.org-openclipart
Version: 0.18
-Release: 1
+Release: 2
License: Creative Commons and/or Public Domain
Group: Applications/Graphics
+Source0: %{name}-%{version}.tar.bz2
+# Source0-md5: b1d699ce11f2bd9d4aed3f4de85d9725
+%if %{without tarball}
BuildRequires: XFree86-Xvfb
BuildRequires: openclipart-png = 0:%{version}
BuildRequires: openoffice.org-core
+%endif
Requires: openclipart-png = 0:%{version}
Requires: openoffice.org-core >= 1:2.1.0-0.m6.6
BuildArch: noarch
@@ -25,8 +34,13 @@
OpenOffice.org extra galleries from <http://www.openclipart.org>.
%prep
+%if %{with tarball}
+%setup -q
+%else
%setup -q -c -T
+%endif
+%if %{without tarball}
%build
OPENCLIPART_DIR=%{_datadir}/openclipart
GAL_BIN=%{_gengal}
@@ -82,6 +96,7 @@
--number-from "$GAL_NUMBER_FROM" || exit 1
}
done
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -101,6 +116,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.8 2007/03/12 01:35:44 glen
+- use prebuilt tarball; rel 2
+
Revision 1.1.2.7 2007/03/11 16:46:08 glen
- allow noarch build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org-openclipart.spec?r1=1.1.2.7&r2=1.1.2.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
