Hello community, here is the log from the commit of package jcifs for openSUSE:Factory checked in at 2017-09-20 17:09:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jcifs (Old) and /work/SRC/openSUSE:Factory/.jcifs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jcifs" Wed Sep 20 17:09:48 2017 rev:13 rq:527144 version:1.3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/jcifs/jcifs.changes 2011-09-23 02:04:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jcifs.new/jcifs.changes 2017-09-20 17:09:49.897705589 +0200 @@ -1,0 +2,6 @@ +Mon Sep 18 21:52:07 UTC 2017 - [email protected] + +- Fix jdk9 build: specify java source and target 1.6 +- Clean spec file and fix rpmlint error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jcifs.spec ++++++ --- /var/tmp/diff_new_pack.e7utd8/_old 2017-09-20 17:09:51.461485456 +0200 +++ /var/tmp/diff_new_pack.e7utd8/_new 2017-09-20 17:09:51.461485456 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jcifs (Version 1.3.8) +# spec file for package jcifs # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,20 @@ %define section free - Name: jcifs Version: 1.3.8 -Release: 2 +Release: 0 Summary: Common Internet File System Client in 100% Java License: LGPL-2.1+ +Group: Development/Libraries/Java Url: http://jcifs.samba.org/ Source0: http://jcifs.samba.org/src/jcifs-%{version}.tar.bz2 -Group: Development/Libraries/Java -Requires: servlet_2_4_api BuildRequires: ant -BuildRequires: java-devel +BuildRequires: fdupes BuildRequires: geronimo-servlet-2_4-api +BuildRequires: java-devel +Requires: servlet_2_4_api BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The jCIFS SMB client library enables any Java application to remotely @@ -46,10 +45,7 @@ give away a modified binary only version of the library itself without reciprocation). - - %package javadoc -License: LGPL-2.1+ Summary: Common Internet File System Client in 100% Java Group: Development/Libraries/Java @@ -66,13 +62,10 @@ give away a modified binary only version of the library itself without reciprocation). - - %package demo -License: LGPL-2.1+ Summary: Common Internet File System Client in 100% Java -Requires: %{name} = %{version} Group: Development/Libraries/Java +Requires: %{name} = %{version} %description demo The jCIFS SMB client library enables any Java application to remotely @@ -87,8 +80,6 @@ give away a modified binary only version of the library itself without reciprocation). - - %prep %setup -q -n %{name}_%{version} find . -name "*.jar" | xargs -t rm @@ -98,9 +89,9 @@ %build export CLASSPATH=$(build-classpath servlet_2_4_api) export OPT_JAR_LIST=: -%ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc +%{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 -(cd examples && %javac -target 1.5 -source 1.5 *.java) +(cd examples && %javac -target 1.6 -source 1.6 *.java) %install # jar @@ -110,27 +101,23 @@ # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # data mkdir -p %{buildroot}%{_datadir}/%{name}/examples cp -pr examples/*{.class,.java} %{buildroot}%{_datadir}/%{name}/examples - -%clean -rm -rf %{buildroot} +%fdupes -s %{buildroot}%{_datadir}/%{name}/examples %files -%defattr(0644,root,root,0755) %doc README.txt docs/*.{html,txt,gif} %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %{_javadocdir}/%{name}-%{version} %files demo -%defattr(0644,root,root,0755) %{_datadir}/%{name} %changelog
