Author: pawelz Date: Sat Apr 3 18:33:59 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- renamed from xmlgraphics-commons
- unified
---- Files affected:
packages/java-xmlgraphics-commons:
java-xmlgraphics-commons.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec
diff -u packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec:1.10
packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec:1.11
--- packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec:1.10
Mon Dec 29 14:21:58 2008
+++ packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec Sat Apr
3 20:33:54 2010
@@ -1,28 +1,38 @@
# $Revision$, $Date$
-#
+
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+
+%include /usr/lib/rpm/macros.java
+
+%define srcname xmlgraphics-commons
Summary: Apache XML Graphics Commons
Summary(pl.UTF-8): Apache XML Graphics Commons - wspólne komponenty
graficzne
-Name: xmlgraphics-commons
+Name: java-xmlgraphics-commons
Version: 1.3.1
Release: 1
License: Apache v2.0
-Group: Libraries
+Group: Libraries/Java
# http://svn.apache.org/repos/asf/xmlgraphics/commons/branches/commons-1_0/
-Source0:
http://www.apache.net.pl/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
+Source0:
http://www.apache.net.pl/xmlgraphics/commons/source/xmlgraphics-commons-1.3.1-src.tar.gz
# Source0-md5: 4dcac6600df8282685be6972bf9b4de4
URL: http://xmlgraphics.apache.org/commons/
BuildRequires: ant >= 1.6.5
BuildRequires: java-commons-io
BuildRequires: java-commons-logging
BuildRequires: jpackage-utils
-BuildRequires: junit >= 3.8.1
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: java-junit >= 3.8.1
BuildRequires: rpmbuild(macros) >= 1.300
# disable internal-codecs in build.properities for compatibility with other
jre's
Requires: java-commons-io
Requires: java-commons-logging
Requires: java-sun-jre >= 1.4
BuildArch: noarch
-ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -42,7 +52,7 @@
pliki PDF oraz PostScript i wiele więcej.
%prep
-%setup -q
+%setup -q -n %{srcname}-%{version}
rm lib/*.jar
ln -s $(find-jar commons-io) lib
@@ -58,8 +68,8 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-install build/xmlgraphics-commons-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install build/xmlgraphics-commons-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
%clean
rm -rf $RPM_BUILD_ROOT
@@ -67,8 +77,8 @@
%files
%defattr(644,root,root,755)
%doc KEYS README lib/README.txt examples
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{srcname}.jar
+%{_javadir}/%{srcname}-%{version}.jar
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -76,6 +86,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2010/04/03 18:33:54 pawelz
+- renamed from xmlgraphics-commons
+- unified
+
Revision 1.10 2008/12/29 13:21:58 pawelz
- up to 1.3.1
- updated dependencies
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
