Hello community, here is the log from the commit of package classworlds for openSUSE:Factory checked in at 2017-05-22 10:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/classworlds (Old) and /work/SRC/openSUSE:Factory/.classworlds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "classworlds" Mon May 22 10:47:32 2017 rev:16 rq:496701 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/classworlds/classworlds.changes 2015-04-02 15:55:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.classworlds.new/classworlds.changes 2017-05-22 10:48:39.370996899 +0200 @@ -1,0 +2,8 @@ +Fri May 19 10:20:33 UTC 2017 - pcervinka@suse.com + +- New build dependency: javapackages-local +- Fixed requires +- Removed maven conditions +- Spec file cleaned + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ classworlds.spec ++++++ --- /var/tmp/diff_new_pack.3FGpaB/_old 2017-05-22 10:48:39.982910652 +0200 +++ /var/tmp/diff_new_pack.3FGpaB/_new 2017-05-22 10:48:39.986910089 +0200 @@ -1,7 +1,7 @@ # # spec file for package classworlds # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,6 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -%bcond_with maven - Name: classworlds Version: 1.1 Release: 0 @@ -34,22 +28,16 @@ Source1: classworlds-1.1-build.xml Source2: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom Patch0: classworlds-1.1-project_xml.patch -#rap#Patch1: classworlds-1.1-project_properties.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRequires: ant >= 1.6 -%if %with maven -BuildRequires: maven >= 1.1 -BuildRequires: saxon -BuildRequires: saxon-scripts -%endif +BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: xerces-j2 BuildRequires: xml-commons-apis Requires: xerces-j2 Requires: xml-commons-apis +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Classworlds is a framework for container developers @@ -75,56 +63,34 @@ can benefit from the classloading control provided by classworlds. - - %prep %setup -q find -name "*.jar" | xargs rm cp -p %{SOURCE1} build.xml -%patch0 -p0 +%patch0 %build -%if %with maven -pushd lib -ln -sf $(build-classpath xml-commons-apis) xmlApis-2.0.2.jar -ln -sf $(build-classpath ant) jakarta-ant-1.5.jar -ln -sf $(build-classpath maven) maven.jar -popd -maven \ - -Dmaven.repo.remote=file:/usr/share/maven/repository \ - -Dmaven.home.local=$(pwd)/.maven \ - jar javadoc xdoc:transform classworlds:build-boot-jar -%else export CLASSPATH=target/classes:target/test-classes export OPT_JAR_LIST=: ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Dbuild.sysclasspath=only jar javadoc -%endif %install install -Dpm 644 target/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -%if %with maven -install -Dpm 644 target/%{name}-boot-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-boot-%{version}.jar -%endif -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # POM and depmap -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -p -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap # javadocs -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # FIXME: (dwalluck): breaks -bi --short-circuit rm -rf target/docs/apidocs -# docs -%if %with maven -cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%endif %files %defattr(0644,root,root,0755) @@ -137,10 +103,5 @@ %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} -#% if %with maven -#% files manual -#% defattr(0644,root,root,0755) -#% doc %{_docdir}/%{name}-%{version} -#% endif %changelog