Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2022-02-24 18:18:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slf4j" Thu Feb 24 18:18:34 2022 rev:27 rq:957222 version:1.7.32 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j.changes 2022-02-23 16:26:16.775508464 +0100 +++ /work/SRC/openSUSE:Factory/.slf4j.new.1958/slf4j.changes 2022-02-24 18:18:50.810732144 +0100 @@ -1,0 +2,20 @@ +Thu Feb 24 07:08:36 UTC 2022 - Fridrich Strba <[email protected]> + +- Do not use a separate spec file for sources, since now they + can be built in the same run as the other artifacts + +------------------------------------------------------------------- +Wed Feb 23 07:17:10 UTC 2022 - Fridrich Strba <[email protected]> + +- Removed patch: + * slf4j-reload4j.patch + + the incompatibility is now handled in reload4j itself + +------------------------------------------------------------------- +Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba <[email protected]> + +- Fetch sources using source service +- Depend for build on reload4j +- Fix dependencies of the module slf4j-log4j12 + +------------------------------------------------------------------- Old: ---- build.xml.tar.bz2 slf4j-reload4j.patch slf4j-sources.changes slf4j-sources.spec v_1.7.32.tar.gz New: ---- _service build.xml.tar.xz slf4j-1.7.32.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.ZSUtCS/_old 2022-02-24 18:18:51.294732014 +0100 +++ /var/tmp/diff_new_pack.ZSUtCS/_new 2022-02-24 18:18:51.298732013 +0100 @@ -25,12 +25,11 @@ License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ -Source0: https://github.com/qos-ch/%{name}/archive/v_%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Source2: build.xml.tar.bz2 +Source2: build.xml.tar.xz Patch1: build-remove-slf4j_api-binder.patch Patch2: slf4j-commons-lang3.patch -Patch3: slf4j-reload4j.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit >= 1.6.5 BuildRequires: apache-commons-lang3 @@ -41,7 +40,7 @@ BuildRequires: javapackages-tools BuildRequires: javassist >= 3.4 BuildRequires: junit >= 3.8.2 -BuildRequires: log4j12-mini +BuildRequires: reload4j Requires: cal10n Requires: java # this is ugly hack, which creates package which requires the same, @@ -86,6 +85,7 @@ %package log4j12 Summary: SLF4J LOG4J-12 Binding Group: Development/Libraries/Java +Requires: mvn(log4j:log4j) Requires: mvn(org.slf4j:slf4j-api) = %{version} %description log4j12 @@ -132,11 +132,17 @@ %description -n jul-to-slf4j JUL to SLF4J bridge. +%package sources +Summary: SLF4J Source JARs +Group: Development/Libraries/Java + +%description sources +SLF4J Source JARs. + %prep -%setup -q -n %{name}-v_%{version} -a2 +%setup -q -a2 %patch1 -p1 %patch2 -p1 -%patch3 -p1 find . -name "*.jar" | xargs rm cp -p %{SOURCE1} APACHE-LICENSE @@ -166,7 +172,7 @@ %pom_change_dep -r -f ::::: ::::: %build -export CLASSPATH=$(build-classpath log4j12/log4j-12 \ +export CLASSPATH=$(build-classpath reload4j \ commons-logging \ commons-lang3 \ javassist-3.14.0 \ @@ -178,20 +184,46 @@ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ package javadoc \ +# Sources +for i in api ext jcl jdk14 log4j12 nop simple; do + mkdir -p %{name}-${i}/target + jar cf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/java . + jar uf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/resources . +done + +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + mkdir -p ${i}/target + jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java . + jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources . +done + %install # jars install -d -m 0755 %{buildroot}%{_javadir}/%{name} + for i in api ext jcl jdk14 log4j12 nop simple; do install -m 644 slf4j-${i}/target/slf4j-${i}-%{version}.jar \ %{buildroot}%{_javadir}/%{name}/${i}.jar ln -sf ${i}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar done + for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do install -m 644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar done +for i in api ext jcl jdk14 log4j12 nop simple; do + install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar \ + %{buildroot}%{_javadir}/%{name}/%{name}-${i}-sources.jar +done + +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + install -pm 0644 ${i}/target/${i}-%{version}-sources.jar \ + %{buildroot}%{_javadir}/%{name}/${i}-sources.jar +done + # poms install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} + for i in api ext jcl jdk14 log4j12 nop simple; do %pom_remove_parent slf4j-${i} %pom_xpath_inject "pom:project" " @@ -199,6 +231,7 @@ <version>%{version}</version>" slf4j-${i} install -pm 644 slf4j-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done + for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do %pom_remove_parent ${i} %pom_xpath_inject "pom:project" " @@ -206,13 +239,23 @@ <version>%{version}</version>" ${i} install -pm 644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done + for i in api nop simple; do %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar done + for i in ext jcl jdk14 log4j12 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} done +for i in api ext jcl jdk14 log4j12 nop simple; do + %add_maven_depmap org.slf4j:%{name}-${i}:jar:sources:%{version} %{name}/%{name}-${i}-sources.jar -f sources +done + +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + %add_maven_depmap org.slf4j:${i}:jar:sources:%{version} %{name}/${i}-sources.jar -f sources +done + # manual install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} rm -f target/site/.htaccess @@ -249,6 +292,8 @@ %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j +%files sources -f .mfiles-sources + %files javadoc %{_javadocdir}/%{name} ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/qos-ch/slf4j.git</param> <param name="revision">v_1.7.32</param> <param name="match-tag">v_*</param> <param name="versionformat">@PARENT_TAG@</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>
