Hello community, here is the log from the commit of package apache-commons-daemon for openSUSE:Factory checked in at 2015-04-02 16:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-daemon (Old) and /work/SRC/openSUSE:Factory/.apache-commons-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-daemon/apache-commons-daemon.changes 2013-09-13 14:45:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-daemon.new/apache-commons-daemon.changes 2015-04-02 16:00:13.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Mar 25 09:15:36 UTC 2015 - tchvatal@suse.com + +- Drop gpg verification. We can stick to what osc services do for us + +------------------------------------------------------------------- +Tue Mar 24 13:54:27 UTC 2015 - tchvatal@suse.com + +- Drop unused patches: + * 0001-execve-path-warning.patch + * config-guess-sub-update.patch + * jsvc-libcap-relative.patch + +------------------------------------------------------------------- +Wed Mar 18 09:45:58 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- Old: ---- 0001-execve-path-warning.patch config-guess-sub-update.patch jsvc-libcap-relative.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-daemon.spec ++++++ --- /var/tmp/diff_new_pack.YDWmT3/_old 2015-04-02 16:00:13.000000000 +0200 +++ /var/tmp/diff_new_pack.YDWmT3/_new 2015-04-02 16:00:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache-commons-daemon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,7 +17,6 @@ %define short_name commons-daemon - Name: apache-%{short_name} Version: 1.0.15 Release: 0 @@ -32,23 +31,17 @@ Patch1: apache-commons-daemon-s390x.patch Patch2: apache-commons-daemon-ppc64.patch Patch3: apache-commons-daemon-aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ant BuildRequires: apache-commons-parent BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: libcap-devel BuildRequires: xmlto - -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif - -Provides: jakarta-%{short_name} = %{version}-%{release} +Provides: jakarta-%{short_name} = %{version} Obsoletes: jakarta-%{short_name} < %{version} -Provides: jakarta-%{short_name}-java = %{version}-%{release} +Provides: jakarta-%{short_name}-java = %{version} Obsoletes: jakarta-%{short_name}-java < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Daemon Component contains a set of Java and native code, including @@ -69,21 +62,16 @@ identity to a non-privileged user. %package javadoc -BuildArch: noarch Summary: Commons Daemon Javadoc Group: Documentation/Other - Provides: jakarta-%{short_name}-javadoc = %{version}-%{release} Obsoletes: jakarta-%{short_name}-javadoc < %{version} +BuildArch: noarch %description javadoc The Javadoc Documentation for Commons Daemon. - %prep -%if 0%{?suse_version} >= 1230 -%gpg_verify %{SOURCE1} -%endif %setup -q -n %{short_name}-%{version}-src %patch0 -p1 %patch1 -p1 @@ -105,31 +93,27 @@ # build native jsvc %configure --with-java=%{java_home} # this is here because 1.0.2 archive contains old *.o -make clean +make %{?_smp_mflags} clean make %{?_smp_mflags} popd ant jar test javadoc %install - # install native jsvc install -Dm 0755 src/native/unix/jsvc %{buildroot}%{_bindir}/jsvc -install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1 +install -Dpm 644 src/native/unix/jsvc.1 %{buildroot}%{_mandir}/man1/jsvc.1 # jars -install -Dpm 644 dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +install -Dpm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar # pom -install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}" # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(-,root,root) @@ -137,7 +121,7 @@ %{_javadir}/%{name}.jar %{_javadir}/%{short_name}.jar %{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%{_datadir}/maven-metadata/%{name}.xml %files jsvc %defattr(-,root,root)