Hello community, here is the log from the commit of package oro for openSUSE:Factory checked in at 2014-06-30 22:50:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oro (Old) and /work/SRC/openSUSE:Factory/.oro.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oro" Changes: -------- --- /work/SRC/openSUSE:Factory/oro/oro.changes 2011-09-23 12:21:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oro.new/oro.changes 2014-06-30 22:50:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 27 12:01:25 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner +- Add support for SLE11 again. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oro.spec ++++++ --- /var/tmp/diff_new_pack.QjAaf5/_old 2014-06-30 22:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.QjAaf5/_new 2014-06-30 22:50:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package oro (Version 2.0.8) +# spec file for package oro # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -# icecream 0 - -Name: oro -BuildRequires: ant java2-devel-packages xml-commons-apis %define name oro %define full_name jakarta-%{name} -%define version 2.0.8 -%define release 2jpp -%define section free +Name: oro Version: 2.0.8 -Release: 271 +Release: 0 Summary: Full regular expressions API License: Apache-2.0 Group: Development/Libraries/Java -Source0: %{full_name}-%{version}.tar.gz Url: http://jakarta.apache.org/oro/ -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: %{full_name}-%{version}.tar.gz +BuildRequires: ant +BuildRequires: java2-devel-packages +BuildRequires: xml-commons-apis Provides: %{full_name} = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Jakarta-ORO Java classes are a set of text-processing Java classes @@ -48,13 +44,9 @@ copyright holder of the ORO libraries. Daniel will continue to participate in their development under the Jakarta Project. - - %package javadoc -License: Apache-2.0 -PreReq: coreutils -Group: Development/Libraries/Java Summary: Javadoc for oro +Group: Development/Libraries/Java Provides: %{full_name}-javadoc = %{version}-%{release} %description javadoc @@ -70,8 +62,6 @@ This package contains the javadoc documentation for ORO. - - %prep %setup -q -n %{full_name}-%{version} # remove all binary libs @@ -81,22 +71,21 @@ for file in `find . -type f -name .cvsignore`; do rm -rf $file; done %build -ant -Dfinal.name=%{name} jar javadocs +ant \ + -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dfinal.name=%{name} jar javadocs %install #jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in oro*.jar; do ln -sf ${jar} jakarta-${jar}; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +(cd %{buildroot}%{_javadir} && for jar in oro*.jar; do ln -sf ${jar} jakarta-${jar}; done) #javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} rm -rf docs/api -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org