Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package juniversalchardet for openSUSE:Factory checked in at 2026-06-30 15:14:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/juniversalchardet (Old) and /work/SRC/openSUSE:Factory/.juniversalchardet.new.11887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "juniversalchardet" Tue Jun 30 15:14:21 2026 rev:4 rq:1362623 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/juniversalchardet/juniversalchardet.changes 2026-05-30 23:01:04.607520663 +0200 +++ /work/SRC/openSUSE:Factory/.juniversalchardet.new.11887/juniversalchardet.changes 2026-06-30 15:14:44.210690744 +0200 @@ -1,0 +2,11 @@ +Mon Jun 29 14:01:11 UTC 2026 - Fridrich Strba <[email protected]> + +- Be closer to the upstream way of building by ant +- Added patches: + * source-target.patch + + build with source/target 8 instead of 5 + * automatic-module-name.patch + + set automatic module name for java 9+ to what some heuristics + used to deduce + +------------------------------------------------------------------- Old: ---- README.txt index.0c5913925d40.txt juniversalchardet-1.0.3-sources.jar New: ---- automatic-module-name.patch juniversalchardet-1.0.3.tar.gz source-target.patch ----------(New B)---------- New: + build with source/target 8 instead of 5 * automatic-module-name.patch + set automatic module name for java 9+ to what some heuristics New:- Added patches: * source-target.patch + build with source/target 8 instead of 5 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ juniversalchardet.spec ++++++ --- /var/tmp/diff_new_pack.4bBHAN/_old 2026-06-30 15:14:45.166723198 +0200 +++ /var/tmp/diff_new_pack.4bBHAN/_new 2026-06-30 15:14:45.166723198 +0200 @@ -23,13 +23,13 @@ License: MPL-1.1 Group: Development/Libraries/Java URL: https://code.google.com/archive/p/juniversalchardet/ -Source0: https://repo1.maven.org/maven2/com/googlecode/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar +Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/%{name}/%{name}-%{version}.tar.gz Source1: https://repo1.maven.org/maven2/com/googlecode/%{name}/%{name}/%{version}/%{name}-%{version}.pom -Source2: https://www.mozilla.org/media/MPL/1.1/index.0c5913925d40.txt -Source3: README.txt +Patch0: source-target.patch +Patch1: automatic-module-name.patch +BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: java-javadoc >= 1.8 BuildRequires: javapackages-local >= 6 BuildArch: noarch @@ -44,40 +44,22 @@ API documentation for %{name}. %prep -%setup -q -T -c -mkdir -p src/main/java -pushd src/main/java -jar -xvf %{SOURCE0} -popd -cp %{SOURCE2} LICENSE.txt -cp %{SOURCE3} . +%setup -q -n %{name} +%patch -P 0 -p1 +%patch -P 1 -p1 %build -mkdir -p target/classes -javac \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - --release 8 \ -%else - -source 8 -target 8 \ -%endif - -encoding UTF-8 -sourcepath src/main/java -d target/classes $(find src/main/java -name \*.java) - -jar --create --verbose \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} - --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ -%endif - --file=%{name}-%{version}.jar -C target/classes . - +ant dist javadoc -source 8 -encoding UTF-8 \ -notimestamp \ -d target/apidocs \ - -sourcepath src/main/java \ + -sourcepath src \ org.mozilla.universalchardet %install # jar install -dm 0755 %{buildroot}%{_javadir}/%{name} -install -pm 0644 %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +install -pm 0644 dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} %{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom @@ -88,10 +70,10 @@ %fdupes %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles -%doc README.txt -%license LICENSE.txt +%doc readme.txt +%license MPL-1.1.txt %files javadoc %{_javadocdir}/%{name} -%license LICENSE.txt +%license MPL-1.1.txt ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.4bBHAN/_old 2026-06-30 15:14:45.202724420 +0200 +++ /var/tmp/diff_new_pack.4bBHAN/_new 2026-06-30 15:14:45.222725099 +0200 @@ -1,6 +1,6 @@ -mtime: 1780047011 -commit: 76e67bea79b614da570b6d898a5845f52af1a64ae678e9a3159a94b59d715fc7 +mtime: 1782809101 +commit: a488d347f4662db86cafb6d9ee4a4d402eaefa7ce2c9931ea2cb04dbe29b48e1 url: https://src.opensuse.org/java-packages/juniversalchardet -revision: 76e67bea79b614da570b6d898a5845f52af1a64ae678e9a3159a94b59d715fc7 +revision: a488d347f4662db86cafb6d9ee4a4d402eaefa7ce2c9931ea2cb04dbe29b48e1 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ automatic-module-name.patch ++++++ --- juniversalchardet/build.xml 2026-06-29 16:24:07.805926017 +0200 +++ juniversalchardet/build.xml 2026-06-29 16:25:30.322391395 +0200 @@ -88,8 +88,11 @@ <target name="dist" depends="compile"> <jar destfile="${dist}/juniversalchardet-${version}.jar" basedir="${dist}/classes" - excludes="**/.svn/" - /> + excludes="**/.svn/"> + <manifest> + <attribute name="Automatic-Module-name" value="juniversalchardet"/> + </manifest> + </jar> </target> <target name="clean"> ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-06-30 10:45:01.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ source-target.patch ++++++ --- juniversalchardet/build.xml 2026-06-29 15:55:57.391631392 +0200 +++ juniversalchardet/build.xml 2026-06-29 15:56:18.706986564 +0200 @@ -64,8 +64,8 @@ <javac sourcepath="" srcdir="${src}" destdir="${dist}/classes" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> <include name="**/*.java"/> <exclude name="**/.svn/"/> <exclude name="**/*Test.java"/>
