Hello community, here is the log from the commit of package jgoodies-forms for openSUSE:Factory checked in at 2014-07-29 16:48:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jgoodies-forms (Old) and /work/SRC/openSUSE:Factory/.jgoodies-forms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgoodies-forms" Changes: -------- --- /work/SRC/openSUSE:Factory/jgoodies-forms/jgoodies-forms.changes 2014-05-06 17:40:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jgoodies-forms.new/jgoodies-forms.changes 2014-07-29 16:48:27.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 11:21:50 UTC 2014 - [email protected] + +- Drop update-alternatives code that is not needed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jgoodies-forms.spec ++++++ --- /var/tmp/diff_new_pack.tgksOP/_old 2014-07-29 16:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.tgksOP/_new 2014-07-29 16:48:28.000000000 +0200 @@ -17,26 +17,24 @@ %define _shortname forms - +%define tar_ver 1_3_0 Name: jgoodies-forms +Version: 1.3.0 +Release: 0 Summary: JGoodies Forms framework License: BSD-3-Clause Group: Development/Languages/Java Url: http://jgoodies.com -Version: 1.3.0 -Release: 0 -%define tar_ver 1_3_0 +Source0: http://www.jgoodies.com/download/libraries/%{_shortname}/%{_shortname}-%{tar_ver}.zip BuildRequires: ant BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: unzip -BuildRequires: update-alternatives BuildRequires: xml-commons-apis BuildRequires: xml-commons-resolver Requires: jre >= 1.5 -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://www.jgoodies.com/download/libraries/%{_shortname}/%{_shortname}-%{tar_ver}.zip +BuildArch: noarch %description The Forms framework helps you lay out and implement elegant Swing @@ -53,10 +51,10 @@ * Leads to better style guide compliance - %package javadoc Summary: Javadoc for JGoodies Forms framework Group: Development/Languages/Java +# FIXME: use proper Requires(pre/post/preun/...) PreReq: coreutils %description javadoc @@ -74,7 +72,6 @@ * Leads to better style guide compliance - %package manual Summary: Documentation for JGoodies Forms framework Group: Development/Languages/Java @@ -94,7 +91,6 @@ * Leads to better style guide compliance - %package demo Summary: Demo files for JGoodies Forms framework Group: Development/Languages/Java @@ -115,11 +111,10 @@ * Leads to better style guide compliance - %prep %setup -q -n %{_shortname}-%{version} # clean up some files -%__rm -f %{_shortname}-%{version}.jar +rm -f %{_shortname}-%{version}.jar # wrong end of line encoding and rigths sed -i -e 's/.$//' LICENSE.txt README.html RELEASE-NOTES.txt find docs -iname '*.html' -or -iname '*.css' | xargs sed -i -e 's/.$//' @@ -127,12 +122,12 @@ %build unset CLASSPATH export CLASSPATH=%{java_home}/jre/lib/rt.jar -%ant compile jar javadoc +%{ant} compile jar javadoc %install # jars -%__install -dm 755 %{buildroot}%{_javadir} -%__install -pm 644 build/%{_shortname}.jar \ +install -dm 755 %{buildroot}%{_javadir} +install -pm 644 build/%{_shortname}.jar \ %{buildroot}%{_javadir}/%{_shortname}-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do @@ -140,24 +135,20 @@ done popd # javadoc -%__install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -%__cp -pr build/docs/api/* \ - %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name} # demo -%__install -dm 755 %{buildroot}%{_datadir}/%{name} -%__cp -pr src/tutorial/* \ - %{buildroot}%{_datadir}/%{name} -%__cp -pr build/classes/tutorial/* \ - %{buildroot}%{_datadir}/%{name} -%__cat > %{name}.sh << EOF +install -dm 755 %{buildroot}%{_datadir}/%{name} +cp -pr src/tutorial/* %{buildroot}%{_datadir}/%{name} +cp -pr build/classes/tutorial/* %{buildroot}%{_datadir}/%{name} +cat > %{name}.sh << EOF #!/bin/bash cd %{_datadir}/%{name} -%java -cp .:%{_javadir}/forms.jar \ +%{java} -cp .:%{_javadir}/forms.jar \ com/jgoodies/forms/tutorial/QuickStartExample EOF -%__install -dm 755 %{buildroot}%{_bindir} -%__install -m 755 %{name}.sh \ +install -dm 755 %{buildroot}%{_bindir} +install -m 755 %{name}.sh \ %{buildroot}%{_bindir} # PACKAGE list of authors in an AUTHORS text file @@ -172,7 +163,6 @@ %files javadoc %defattr(-,root,root) -%doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %files manual -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
