Hello community, here is the log from the commit of package apache-ivy for openSUSE:Factory checked in at 2013-11-08 14:34:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old) and /work/SRC/openSUSE:Factory/.apache-ivy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-ivy" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2013-09-12 17:07:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-ivy.new/apache-ivy.changes 2013-11-08 14:34:38.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 6 10:58:10 UTC 2013 - mvysko...@suse.com + +- Remove jakarta-commons-httpclient3, we do no longer provide it +- Add ant.d config snippet for ivy +- call add_maven_depmap + +------------------------------------------------------------------- New: ---- ivy-2.3.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-ivy.spec ++++++ --- /var/tmp/diff_new_pack.DjjWgk/_old 2013-11-08 14:34:39.000000000 +0100 +++ /var/tmp/diff_new_pack.DjjWgk/_new 2013-11-08 14:34:39.000000000 +0100 @@ -26,6 +26,7 @@ Url: http://ant.apache.org/ivy/ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 +Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -33,12 +34,8 @@ BuildRequires: ant BuildRequires: ant-nodeps -%if 0%{?suse_version} -BuildRequires: jakarta-commons-httpclient3 -%else -BuildRequires: commons-httpclient -%endif BuildRequires: bouncycastle +BuildRequires: commons-httpclient BuildRequires: java-devel >= 1.5 BuildRequires: javapackages-tools BuildRequires: jsch @@ -90,47 +87,45 @@ # Craft class path mkdir -p lib -build-jar-repository lib ant ant/ant-nodeps oro jsch \ -%if 0%{?suse_version} -jakarta-commons-httpclient3 -%else -commons-httpclient -%endif +build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient # Build ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc %install # Code -install -d $RPM_BUILD_ROOT%{_javadir} -install -p -m644 build/artifact/jars/ivy.jar $RPM_BUILD_ROOT%{_javadir}/ivy-%{version}.jar -ln -sf ivy-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar +install -d %{buildroot}%{_javadir} +install -p -m644 build/artifact/jars/ivy.jar %{buildroot}%{_javadir}/ivy.jar + +install -d -m 0755 %{buildroot}/%{_mavenpomdir}/ +install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom +# Maven depmap +%add_maven_depmap JPP-ivy.pom ivy.jar # API Documentation -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d %{buildroot}%{_javadocdir}/%{name} +cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name} # Command line script MAIN_CLASS=`sed -rn 's/^Main-Class: (.*)$/\1/gp' META-INF/MANIFEST.MF | tr -d '\r'` -%if 0%{?suse_version} -%jpackage_script "${MAIN_CLASS}" "" "" ant:ant/ant-nodeps:ivy:oro:jsch:jakarta-commons-httpclient3 ivy -%else %jpackage_script "${MAIN_CLASS}" "" "" ant:ant/ant-nodeps:ivy:oro:jsch:commons-httpclient ivy -%endif + +mkdir -p %{buildroot}%{_sysconfdir}/ant.d +echo "ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name} # Man page install -d ${RPM_BUILD_ROOT}%{_mandir}/man1 install %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1/ivy.1 -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%{_javadir}/* %doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README +%config %{_sysconfdir}/ant.d/%{name} +%{_javadir}/ivy.jar %attr(755,root,root) %{_bindir}/* %attr(644,root,root) %{_mandir}/man1/* +%{_mavenpomdir}/JPP-ivy.pom +%{_mavendepmapfragdir}/%{name} %files javadoc %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
