Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jmock for openSUSE:Factory checked in at 2024-02-21 18:01:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jmock (Old) and /work/SRC/openSUSE:Factory/.jmock.new.1706 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jmock" Wed Feb 21 18:01:17 2024 rev:21 rq:1148701 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jmock/jmock.changes 2022-03-23 20:21:19.250562643 +0100 +++ /work/SRC/openSUSE:Factory/.jmock.new.1706/jmock.changes 2024-02-21 18:01:29.330313050 +0100 @@ -1,0 +2,6 @@ +Wed Feb 21 13:15:03 UTC 2024 - Fridrich Strba <[email protected]> + +- Use %patch -P N instead of deprecated %patchN. +- Fetch sources using source service + +------------------------------------------------------------------- Old: ---- jmock-1.2.0.tar.gz New: ---- _service jmock-1.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jmock.spec ++++++ --- /var/tmp/diff_new_pack.8KOgUh/_old 2024-02-21 18:01:29.866332468 +0100 +++ /var/tmp/diff_new_pack.8KOgUh/_new 2024-02-21 18:01:29.870332613 +0100 @@ -1,7 +1,7 @@ # # spec file for package jmock # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,9 @@ License: BSD-3-Clause Group: Development/Libraries/Java URL: http://jmock.codehaus.org/license.html -Source0: jmock-1.2.0.tar.gz -# svn export http://svn.codehaus.org/jmock/tags/1.2.0/ jmock-1.2.0 -Source1: jmock-1.2.0.pom -Source2: jmock-cglib-1.2.0.pom +Source0: %{name}-%{version}.tar.xz +Source1: https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom +Source2: https://repo1.maven.org/maven2/jmock/%{name}-cglib/%{version}/%{name}-cglib-%{version}.pom Patch0: jmock-1.2.0-AssertMo.patch Patch1: jmock-1.2.0-build_xml.patch BuildRequires: ant >= 1.6 @@ -36,11 +35,7 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: junit >= 3.8.1 -BuildRequires: objectweb-asm >= 5 -Requires: cglib >= 2.1.3 -Requires: objectweb-asm >= 5 BuildArch: noarch %description @@ -90,15 +85,15 @@ %prep %setup -q find . -name "*.jar" | xargs rm -%patch0 -%patch1 +%patch -P 0 +%patch -P 1 # needs net.sf.cglib.asm. classes fron dropped cglib-nohook rm -rf src/test src/atest %build export OPT_JAR_LIST="ant/ant-junit junit" -export CLASSPATH=`pwd`/build/classes:$(build-classpath objectweb-asm cglib) +export CLASSPATH=`pwd`/build/classes:$(build-classpath cglib) ant \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \ -Dbuild.sysclasspath=only \ @@ -114,11 +109,12 @@ # poms install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE1} \ +%{mvn_install_pom} %{SOURCE1} \ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -#install -pm 644 %{SOURCE2} \ -# $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-cglib.pom -%add_maven_depmap +%add_maven_depmap JPP-%{name}.pom %{name}.jar +%{mvn_install_pom} %{SOURCE2} \ + %{buildroot}%{_mavenpomdir}/JPP-%{name}-cglib.pom +%add_maven_depmap JPP-%{name}-cglib.pom %{name}-cglib.jar # install -dm 755 %{buildroot}%{_javadocdir}/%{name} @@ -127,12 +123,12 @@ # install -dm 755 %{buildroot}%{_datadir}/%{name}-%{version} cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_datadir}/%{name}-%{version} -%files -%doc LICENSE.txt overview.html -%{_javadir}/*.jar -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml* +%files -f .mfiles +%license LICENSE.txt +%doc overview.html +%{_javadir}/%{name}-tests.jar %files javadoc %{_javadocdir}/%{name} ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/jmock-developers/jmock-library.git</param> <param name="revision">1.2.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="filename">jmock</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
