Hello community,
here is the log from the commit of package apache-portlet-1_0-api for
openSUSE:Factory checked in at 2014-07-16 16:49:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-portlet-1_0-api (Old)
and /work/SRC/openSUSE:Factory/.apache-portlet-1_0-api.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-portlet-1_0-api"
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-portlet-1_0-api/apache-portlet-1_0-api.changes
2013-09-11 13:39:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.apache-portlet-1_0-api.new/apache-portlet-1_0-api.changes
2014-07-16 16:49:38.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 8 11:00:39 UTC 2014 - [email protected]
+
+- Do not depend on ant-nodeps.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-portlet-1_0-api.spec ++++++
--- /var/tmp/diff_new_pack.pPERi9/_old 2014-07-16 16:49:39.000000000 +0200
+++ /var/tmp/diff_new_pack.pPERi9/_new 2014-07-16 16:49:39.000000000 +0200
@@ -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 @@
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-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 @@
%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)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
