Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cal10n for openSUSE:Factory checked in at 2022-05-14 22:51:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cal10n (Old) and /work/SRC/openSUSE:Factory/.cal10n.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cal10n" Sat May 14 22:51:52 2022 rev:13 rq:976400 version:0.8.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/cal10n/cal10n.changes 2022-04-23 19:45:18.434936312 +0200 +++ /work/SRC/openSUSE:Factory/.cal10n.new.1538/cal10n.changes 2022-05-14 22:51:53.550970677 +0200 @@ -1,0 +2,12 @@ +Wed May 11 13:18:07 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Fetch sources using source service from ch.qos git +- Upgrade to the 10th commit after 0.8.1 calling it 0.8.1.10 +- Redo completely the packaging including the possibility to run + tests if --with tests is specified +- Add the cal10n-ant-task to built artifacts +- Removed patch: + * cal10n-0.7.7-sourcetarget.patch + + changes factored into the build system + +------------------------------------------------------------------- Old: ---- build.xml-0.8.1.tar.xz cal10n-0.7.7-sourcetarget.patch cal10n-0.8.1.tar.gz New: ---- _service cal10n-0.8.1.10.tar.xz cal10n-build.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cal10n.spec ++++++ --- /var/tmp/diff_new_pack.tn9vZ8/_old 2022-05-14 22:51:54.138971412 +0200 +++ /var/tmp/diff_new_pack.tn9vZ8/_new 2022-05-14 22:51:54.142971417 +0200 @@ -16,26 +16,27 @@ # +%bcond_with tests Name: cal10n -Version: 0.8.1 +Version: 0.8.1.10 Release: 0 Summary: Compiler assisted localization library (CAL10N) License: MIT Group: Development/Libraries/Java URL: http://cal10n.qos.ch -Source0: https://github.com/qos-ch/cal10n/archive/refs/tags/v_%{version}.tar.gz#:/%{name}-%{version}.tar.gz -Source1: build.xml-0.8.1.tar.xz -Patch0: cal10n-0.7.7-sourcetarget.patch +Source0: %{name}-%{version}.tar.xz +Source1: %{name}-build.tar.xz BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools -BuildRequires: junit BuildRequires: xz Requires: java -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%if %{with tests} +BuildRequires: ant-antunit +BuildRequires: ant-junit +%endif %description Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion") @@ -56,11 +57,13 @@ API documentation for %{name}. %prep -%setup -q -n %{name}-v_%{version} -tar -xf %{SOURCE1} -%patch0 -p1 +%setup -q -a1 find . -name "*.jar" -exec rm -f {} \; +# We don't want to depend on ant, since it will be +# present when we try to use the task +%pom_change_dep :ant :::provided %{name}-ant-task + # bnc#759912 rm -rf docs cal10n-site cat > README.SUSE <<EOF @@ -74,53 +77,47 @@ EOF %build -for dir in cal10n-api -do - pushd $dir - export CLASSPATH=$(build-classpath \ - junit \ - ):target/classes:target/test-classes - ant -Dmaven.mode.offline=true package javadoc \ - -Dmaven.test.skip=true \ - -lib %{_datadir}/java - popd -done +mkdir -p lib +build-jar-repository -s lib \ +%if %{with tests} + ant-antunit \ +%endif + ant/ant +%{ant} \ +%if %{without tests} + -Dtest.skip=true \ +%endif + package javadoc %install # jars install -d -m 0755 %{buildroot}%{_javadir}/%{name} -install -m 644 cal10n-api/target/cal10n-api-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/cal10n-api-%{version}.jar +install -m 644 %{name}-api/target/%{name}-api-*.jar \ + %{buildroot}%{_javadir}/%{name}/%{name}-api.jar +install -m 644 %{name}-ant-task/target/%{name}-ant-task-*.jar \ + %{buildroot}%{_javadir}/%{name}/%{name}-ant-task.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom install -pm 644 %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom -%add_maven_depmap %{name}-api.pom %{name}/cal10n-api-%{version}.jar +%add_maven_depmap %{name}-api.pom %{name}/%{name}-api.jar +install -pm 644 %{name}-ant-task/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-ant-task.pom +%add_maven_depmap %{name}-ant-task.pom %{name}/%{name}-ant-task.jar # javadoc -pushd cal10n-api -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr target/site/apidocs*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ -rm -rf target/site/api* -popd -%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +for i in api ant-task; do + install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} + cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ +done +%fdupes -s %{buildroot}%{_javadocdir}/%{name} -%files -%defattr(0644,root,root,0755) +%files -f .mfiles %doc README.SUSE -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{name}*.jar -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/qos-ch/cal10n.git</param> <param name="revision">22c048801fb6d04c991a0c8c01bb6fb97ef50b37</param> <param name="match-tag">v_*</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> <param name="versionrewrite-pattern">v_(.*)</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>
