From 774e81104eb2297bc3b9fed37028b7fb472fdd9f10f4d81d1d27ba1a8aa79da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 8 Jul 2014 11:01:06 +0000 Subject: [PATCH] - Do not depend on ant-nodeps. OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-portlet-1_0-api?expand=0&rev=9 --- apache-portlet-1_0-api.changes | 5 ++++ apache-portlet-1_0-api.spec | 42 +++++++++++++++------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/apache-portlet-1_0-api.changes b/apache-portlet-1_0-api.changes index 21f4769..39b8890 100644 --- a/apache-portlet-1_0-api.changes +++ b/apache-portlet-1_0-api.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 8 11:00:39 UTC 2014 - tchvatal@suse.com + +- Do not depend on ant-nodeps. + ------------------------------------------------------------------- Mon Sep 9 11:05:30 UTC 2013 - tchvatal@suse.com diff --git a/apache-portlet-1_0-api.spec b/apache-portlet-1_0-api.spec index c5294ed..aeea7b2 100644 --- a/apache-portlet-1_0-api.spec +++ b/apache-portlet-1_0-api.spec @@ -1,7 +1,7 @@ # # spec file for package apache-portlet-1_0-api # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,6 @@ %define with_maven 0 %define short_name portlet %define base_name %{short_name}-1.0-api - Name: apache-portlet-1_0-api Version: 1.0 Release: 0 @@ -35,9 +34,12 @@ Source1: apache-portlet-1.0-api-pom.xml Source2: apache-portlet-1.0-api-LICENSE.TXT Source3: apache-portlet-1.0-api-build.xml BuildRequires: ant >= 1.6 -BuildRequires: ant-nodeps BuildRequires: java-devel >= 1.4 BuildRequires: javapackages-tools +Provides: portlet = %{version} +Provides: portlet-1.0-api = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if %{with_maven} BuildRequires: maven2 >= 2.0.4-9 BuildRequires: maven2-plugin-compiler @@ -48,28 +50,20 @@ BuildRequires: maven2-plugin-release BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-surefire %endif -PreReq: javapackages-tools -Provides: portlet = %{version} -Provides: portlet-1.0-api = %{version} -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 . - - %package javadoc Summary: Portlet API 1.0 from Jetspeed2 Group: Development/Libraries/Java -Requires(post): /bin/rm,/bin/ln +Requires(post): /bin/ln +Requires(post): /bin/rm Requires(postun): /bin/rm %description javadoc Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 . - - %{summary}. %prep @@ -90,25 +84,25 @@ ant jar javadoc %endif %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 0644 target/portlet-api-1.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar %{base_name}-%{version}.jar) -(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar portlet-api-%{version}.jar) +install -d -m 755 %{buildroot}%{_javadir} +install -m 0644 target/portlet-api-1.0.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && ln -sf %{name}-%{version}.jar %{base_name}-%{version}.jar) +(cd %{buildroot}%{_javadir} && ln -sf %{name}-%{version}.jar portlet-api-%{version}.jar) # create unversioned symlinks -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} $(echo $jar | sed -e 's+-%{version}\.jar+.jar+'); done) +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} $(echo $jar | sed -e 's+-%{version}\.jar+.jar+'); done) #poms install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-portlet-api.pom +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-portlet-api.pom %add_maven_depmap JPP-portlet-api.pom portlet-api.jar #javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr target/site/apidocs/* \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE.TXT + %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version} +cp %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE.TXT %files %defattr(0644,root,root,0755)