Hello community, here is the log from the commit of package jgroups for openSUSE:Factory checked in at 2014-07-11 20:05:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jgroups (Old) and /work/SRC/openSUSE:Factory/.jgroups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgroups" Changes: -------- --- /work/SRC/openSUSE:Factory/jgroups/jgroups.changes 2014-06-30 22:49:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jgroups.new/jgroups.changes 2014-07-11 20:05:50.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:46:17 UTC 2014 - [email protected] + +- Do not depend on ant-trax and run spec-cleaner. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jgroups.spec ++++++ --- /var/tmp/diff_new_pack.drksFG/_old 2014-07-11 20:05:51.000000000 +0200 +++ /var/tmp/diff_new_pack.drksFG/_new 2014-07-11 20:05:51.000000000 +0200 @@ -26,8 +26,6 @@ # give rpmbuild option '--without tests' %define with_tests %{!?_without_tests:1}%{?_without_tests:0} %define without_tests %{?_without_tests:1}%{!?_without_tests:0} -%define section free - Name: jgroups Version: 2.6.10 Release: 0 @@ -51,34 +49,28 @@ Source1: jgroups-component-info.xml #PATCH-FIX-OPENSUSE: junit.swingui does not exists in junit 4 Patch0: jgroups-swingui.patch -# To use JGroups one needs: -Requires: apache-commons-logging -# 2.5+ uses java.util.concurrent -#Requires: concurrent -Requires: bsh -Requires: geronimo-jms-1_1-api -Requires: jaxp_parser_impl -Requires: log4j -#Optional: mx4j -Provides: javagroups = %{version} -Obsoletes: javagroups < %{version} BuildRequires: ant >= 1.6 BuildRequires: ant-junit -BuildRequires: ant-trax +BuildRequires: apache-commons-logging BuildRequires: bsh +BuildRequires: geronimo-jms-1_1-api BuildRequires: java-devel >= 1.5.0 BuildRequires: javapackages-tools -# 2.5+ uses java.util.concurrent -#BuildRequires: concurrent -BuildRequires: apache-commons-logging -BuildRequires: geronimo-jms-1_1-api BuildRequires: jaxp_parser_impl BuildRequires: junit BuildRequires: log4j BuildRequires: mx4j BuildRequires: xalan-j2 -BuildArch: noarch +# To use JGroups one needs: +Requires: apache-commons-logging +Requires: bsh +Requires: geronimo-jms-1_1-api +Requires: jaxp_parser_impl +Requires: log4j +Provides: javagroups = %{version} +Obsoletes: javagroups < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description JGroups is a toolkit for reliable multicast communication. (Note that @@ -120,7 +112,6 @@ %endif %package javadoc -PreReq: coreutils Summary: Javadoc for jgroups Group: Development/Libraries/Java @@ -197,35 +188,32 @@ %install # jar -install -d $RPM_BUILD_ROOT%{_javadir} +install -d %{buildroot}%{_javadir} install -m 644 dist/%{name}-all.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar install -m 644 dist/%{name}-core.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-core-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ -(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name}) +install -d %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ +(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name}) # services -install -p -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +install -p -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version} install -m 644 dist/%{name}*.sar \ - $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} + %{buildroot}%{_datadir}/%{name}-%{version} # docs -install -p -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +install -p -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version} +cp -pr doc/* %{buildroot}%{_docdir}/%{name}-%{version} %if %{with_repolib} - install -d -m 755 $RPM_BUILD_ROOT%{repodir} - install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} - install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml - install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} - install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc} - cp -p $RPM_BUILD_ROOT%{_javadir}/jgroups.jar $RPM_BUILD_ROOT%{repodirlib} + install -d -m 755 %{buildroot}%{repodir} + install -d -m 755 %{buildroot}%{repodirlib} + install -m 755 %{SOURCE1} %{buildroot}%{repodir}/component-info.xml + install -d -m 755 %{buildroot}%{repodirsrc} + install -m 755 %{SOURCE0} %{buildroot}%{repodirsrc} + cp -p %{buildroot}%{_javadir}/jgroups.jar %{buildroot}%{repodirlib} %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(0644,root,root,0755) %doc CREDITS INSTALL.html README LICENSE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
