Author: glen Date: Fri Oct 21 22:20:36 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- package renamed to java-libxml (we don't have name conflict with c-library),
builds now
---- Files affected:
packages/java-libxml:
java-libxml.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/java-libxml/java-libxml.spec
diff -u packages/java-libxml/java-libxml.spec:1.2
packages/java-libxml/java-libxml.spec:1.3
--- packages/java-libxml/java-libxml.spec:1.2 Fri Oct 21 21:03:49 2011
+++ packages/java-libxml/java-libxml.spec Sat Oct 22 00:20:31 2011
@@ -1,27 +1,31 @@
# $Revision$, $Date$
-%define origname libxml
+#
+# Conditional build:
+%bcond_without javadoc # don't build javadoc
+
+%define srcname libxml
%include /usr/lib/rpm/macros.java
Summary: Namespace aware SAX-Parser utility library
-Name: java-pentaho-%{origname}
+Name: java-%{srcname}
Version: 1.1.3
-Release: 0.1
+Release: 1
License: LGPL v2+
-Group: Libraries
-Source0:
http://downloads.sourceforge.net/jfreereport/%{origname}-%{version}.zip
+Group: Libraries/Java
+Source0:
http://downloads.sourceforge.net/jfreereport/%{srcname}-%{version}.zip
# Source0-md5: 8008caa6819ed7a03eb908cc989a65b9
-Patch0: libxml-1.1.2-build.patch
+Patch0: build.patch
URL: http://reporting.pentaho.org/
BuildRequires: ant
-#BuildRequires: ant-contrib
+BuildRequires: ant-contrib
BuildRequires: ant-nodeps
+BuildRequires: java-libbase
+BuildRequires: java-libloader
BuildRequires: jdk
BuildRequires: jpackage-utils
-#BuildRequires: libbase
-#BuildRequires: libloader
BuildRequires: rpmbuild(macros) >= 1.553
+Requires: java-libbase >= 1.1.2
+Requires: java-libloader >= 1.1.2
Requires: jpackage-utils
-#Requires: libbase >= 1.1.2
-#Requires: libloader >= 1.1.2
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,41 +48,46 @@
%undos README.txt licence-LGPL.txt ChangeLog.txt
-find . -name "*.jar" | xargs rm -v
+find -name "*.jar" | xargs rm -v
+install -d lib
ln -s %{_javadir}/ant lib/ant-contrib
%build
-mkdir -p lib
build-jar-repository -s -p lib commons-logging-api libbase libloader
-%ant jar javadoc
+%ant jar %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{origname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{origname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{origname}.jar #
ghost symlink
+cp -p dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar #
ghost symlink
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{origname}
-cp -a bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{origname}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a bin/javadoc/docs/api/*
$RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-ln -nfs %{origname}-%{version} %{_javadocdir}/%{origname}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
%doc licence-LGPL.txt README.txt ChangeLog.txt
-%{_javadir}/%{origname}-%{version}.jar
-%{_javadir}/%{origname}.jar
+%{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}.jar
%if %{with javadoc}
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/%{origname}-%{version}
-%ghost %{_javadocdir}/%{origname}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -87,6 +96,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2011/10/21 22:20:31 glen
+- package renamed to java-libxml (we don't have name conflict with c-library),
builds now
+
Revision 1.2 2011/10/21 19:03:49 glen
- prepare for pld
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-libxml/java-libxml.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
