Author: glen Date: Sun Mar 11 16:43:26 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- noarch now
---- Files affected:
SPECS:
openoffice.org-openclipart.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/openoffice.org-openclipart.spec
diff -u SPECS/openoffice.org-openclipart.spec:1.4
SPECS/openoffice.org-openclipart.spec:1.5
--- SPECS/openoffice.org-openclipart.spec:1.4 Fri Mar 9 00:56:55 2007
+++ SPECS/openoffice.org-openclipart.spec Sun Mar 11 17:43:21 2007
@@ -4,7 +4,7 @@
Summary: OpenOffice.org clipart from openclipart
Name: openoffice.org-openclipart
Version: 0.18
-Release: 0.2
+Release: 1
License: Creative Commons and/or Public Domain
Group: Applications/Graphics
BuildRequires: openclipart-png = 0:%{version}
@@ -14,16 +14,13 @@
BuildRequires: xorg-font-font-misc-misc-base
BuildRequires: xorg-xserver-Xvfb
Requires: openclipart-png = 0:%{version}
-Requires: openoffice.org-core >= 1:2.1.0-0.m6.5
+Requires: openoffice.org-core >= 1:2.1.0-0.m6.6
+BuildArch: noarch
# same as openoffice.org
ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
-# can't do yet
-#BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _ooodir %{_libdir}/openoffice.org
-%define _gengal %{_ooodir}/program/gengal
-%define _ooogaldir %{_ooodir}/share/gallery
+%define _ooogaldir %{_datadir}/openoffice.org/share/gallery
%description
OpenOffice.org extra galleries from <http://www.openclipart.org>.
@@ -33,7 +30,11 @@
%build
OPENCLIPART_DIR=%{_datadir}/openclipart
-GAL_BIN=%{_gengal}
+if [ -x /usr/lib64/openoffice.org/program/gengal ]; then
+ GAL_BIN=/usr/lib64/openoffice.org/program/gengal
+elif [ -x /usr/lib/openoffice.org/program/gengal ]; then
+ GAL_BIN=/usr/lib/openoffice.org/program/gengal
+fi
GAL_DIR=$(pwd)/gallery
# start number for the new galleries
GAL_NUMBER_FROM=70
@@ -105,6 +106,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2007/03/11 16:43:21 glen
+- noarch now
+
Revision 1.4 2007/03/08 23:56:55 glen
- needs clipart-png also at runtime
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org-openclipart.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
