Hello community, here is the log from the commit of package jcifs for openSUSE:Leap:15.2 checked in at 2020-02-05 07:29:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/jcifs (Old) and /work/SRC/openSUSE:Leap:15.2/.jcifs.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jcifs" Wed Feb 5 07:29:16 2020 rev:12 rq:764764 version:1.3.19 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/jcifs/jcifs.changes 2020-01-15 15:13:18.666170930 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.jcifs.new.26092/jcifs.changes 2020-02-05 07:29:22.894745754 +0100 @@ -1,0 +2,20 @@ +Thu Dec 19 15:40:45 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Fix en incorrect URL of the pom file + +------------------------------------------------------------------- +Thu Feb 7 07:52:15 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Build against glassfish-servlet-api +- Added patch: + * jcifs-1.3.19-build.patch + + do not hardcode java 1.5 compiler path + +------------------------------------------------------------------- +Sun Nov 18 16:15:32 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Add maven pom file and generate the corresponding mvn(...) + dependencies +- Add alias to org.samba.jcifs:jcifs + +------------------------------------------------------------------- Old: ---- jcifs-1.3.8.tar.bz2 New: ---- jcifs-1.3.17.pom jcifs-1.3.19-build.patch jcifs-1.3.19.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jcifs.spec ++++++ --- /var/tmp/diff_new_pack.sZ4Jyi/_old 2020-02-05 07:29:23.258745908 +0100 +++ /var/tmp/diff_new_pack.sZ4Jyi/_new 2020-02-05 07:29:23.258745908 +0100 @@ -1,7 +1,7 @@ # # spec file for package jcifs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,24 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define section free Name: jcifs -Version: 1.3.8 +Version: 1.3.19 Release: 0 Summary: Common Internet File System Client in 100% Java -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/Java -Url: http://jcifs.samba.org/ -Source0: http://jcifs.samba.org/src/jcifs-%{version}.tar.bz2 +URL: http://jcifs.samba.org/ +Source0: http://jcifs.samba.org/src/%{name}-%{version}.tgz +Source1: https://repo1.maven.org/maven2/jcifs/jcifs/1.3.17/jcifs-1.3.17.pom +Patch0: jcifs-1.3.19-build.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: geronimo-servlet-2_4-api +BuildRequires: glassfish-servlet-api BuildRequires: java-devel -Requires: servlet_2_4_api +BuildRequires: javapackages-local +Requires: mvn(javax.servlet:javax.servlet-api) BuildArch: noarch %description @@ -47,7 +50,7 @@ %package javadoc Summary: Common Internet File System Client in 100% Java -Group: Development/Libraries/Java +Group: Documentation/HTML %description javadoc The jCIFS SMB client library enables any Java application to remotely @@ -82,15 +85,25 @@ %prep %setup -q -n %{name}_%{version} -find . -name "*.jar" | xargs -t rm +find -name '*.class' -delete +find -name '*.jar' -delete # failed to build rm examples/GetLocalGroupsMap.java +rm examples/SmbShell.java +%patch0 -p1 +sed -i "s|1.5|1.6|" build.xml +cp -p %{SOURCE1} pom.xml +sed -i "s|<version>1.3.17|<version>%{version}|" pom.xml +%pom_remove_plugin :maven-gpg-plugin + +%pom_xpath_set "pom:dependency[pom:groupId = 'javax.servlet']/pom:version" 3.1.0 +%pom_xpath_set "pom:dependency[pom:groupId = 'javax.servlet']/pom:artifactId" javax.servlet-api %build -export CLASSPATH=$(build-classpath servlet_2_4_api) +export CLASSPATH=$(build-classpath glassfish-servlet-api) export OPT_JAR_LIST=: %{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadoc -export CLASSPATH=$(build-classpath servlet_2_4_api):`pwd`/%{name}-%{version}.jar +export CLASSPATH=$(build-classpath glassfish-servlet-api):$(pwd)/%{name}-%{version}.jar (cd examples && %javac -target 1.6 -source 1.6 *.java) %install @@ -98,6 +111,11 @@ mkdir -p %{buildroot}%{_javadir} install -p -m 644 %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) +# pom +mkdir -p %{buildroot}%{_mavenpomdir} +install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom +%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a "org.samba.jcifs:jcifs" + # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} @@ -108,10 +126,9 @@ cp -pr examples/*{.class,.java} %{buildroot}%{_datadir}/%{name}/examples %fdupes -s %{buildroot}%{_datadir}/%{name}/examples -%files +%files -f .mfiles %doc README.txt docs/*.{html,txt,gif} %{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar %files javadoc %{_javadocdir}/%{name} ++++++ jcifs-1.3.17.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>jcifs</groupId> <artifactId>jcifs</artifactId> <version>1.3.17</version> <packaging>jar</packaging> <name>jCIFS</name> <url>http://jcifs.samba.org</url> <description>JCIFS is an Open Source client library that implements the CIFS/SMB networking protocol in 100% Java</description> <licenses> <license> <name>GNU Lesser General Public License, version 2.1</name> <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url> <distribution>repo</distribution> </license> </licenses> <scm> <url>http://jcifs.samba.org/src/</url> </scm> <dependencies> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> </dependency> </dependencies> <build> <sourceDirectory>${project.basedir}/src</sourceDirectory> <resources> <resource> <directory>src</directory> <includes> <include>**/*.map</include> <include>**/*.css</include> <include>**/*.idl</include> </includes> </resource> </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.1.2</version> <executions> <execution> <id>attach-sources</id> <goals> <goal>jar</goal> </goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.8.1</version> <executions> <execution> <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> <version>1.4</version> <executions> <execution> <id>sign-artifacts</id> <phase>verify</phase> <goals> <goal>sign</goal> </goals> </execution> </executions> </plugin> </plugins> </build> <developers> <developer> <id>mike</id> <name>Michael B. Allen</name> <email>iop...@gmail.com</email> </developer> </developers> </project> ++++++ jcifs-1.3.19-build.patch ++++++ --- jcifs_1.3.19/build.xml 2018-01-05 20:43:03.000000000 +0100 +++ jcifs_1.3.19/build.xml 2018-11-18 17:03:56.726174703 +0100 @@ -52,8 +52,6 @@ source="1.5" target="1.5" fork="yes" - executable="/usr/local/java/bin/javac" - compiler="javac1.5" debug="on"> <!-- <compilerarg line="-Xlint:deprecation -Xlint:unchecked"/>
