diff --git a/apache-portlet-1.0-api-build.xml b/apache-portlet-1.0-api-build.xml index 305f63b..06c6b83 100644 --- a/apache-portlet-1.0-api-build.xml +++ b/apache-portlet-1.0-api-build.xml @@ -39,7 +39,7 @@ - + diff --git a/apache-portlet-1_0-api.changes b/apache-portlet-1_0-api.changes index a6987f2..89d2159 100644 --- a/apache-portlet-1_0-api.changes +++ b/apache-portlet-1_0-api.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 25 16:59:29 CEST 2008 - mvyskocil@suse.cz + +- target=1.5 source=1.5 +- remove a gcj build support +- fixed some rpmlint warnings + ------------------------------------------------------------------- Thu Mar 13 14:30:01 CET 2008 - mvyskocil@suse.cz diff --git a/apache-portlet-1_0-api.spec b/apache-portlet-1_0-api.spec index e074020..92dd533 100644 --- a/apache-portlet-1_0-api.spec +++ b/apache-portlet-1_0-api.spec @@ -2,16 +2,20 @@ # spec file for package apache-portlet-1_0-api (Version 1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} -# If you don't want to build with maven, and use straight ant instead, -# give rpmbuild option '--without maven' %define with_maven %{!?_without_maven:1}%{?_without_maven:0} %define without_maven %{?_without_maven:1}%{!?_without_maven:0} %define with_maven 0 @@ -20,7 +24,7 @@ Name: apache-portlet-1_0-api Version: 1.0 -Release: 2 +Release: 85 Summary: Portlet API 1.0 from Jetspeed2 License: The Apache Software License Url: http://portals.apache.org/jetspeed-2/ @@ -43,20 +47,11 @@ BuildRequires: maven2-plugin-release BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-surefire %endif -Requires(post): jpackage-utils >= 1.7.2 -Requires(postun): jpackage-utils >= 1.7.2 +PreReq: jpackage-utils >= 1.7.2 Provides: portlet = %{version} Provides: portlet-1.0-api = %{version} -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{gcj_support} -BuildRequires: gnu-crypto -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif %description Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 . @@ -64,6 +59,7 @@ Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 . %package javadoc +License: The Apache Software License Summary: Portlet API 1.0 from Jetspeed2 Group: Development/Libraries/Java Requires(post): /bin/rm,/bin/ln @@ -94,7 +90,6 @@ ant jar javadoc %endif %install -rm -rf $RPM_BUILD_ROOT 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) @@ -107,43 +102,18 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.portlet-api.p install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr target/site/apidocs/* \ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +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 -%if %{gcj_support} -export CLASSPATH=$(build-classpath gnu-crypto) -%{_bindir}/aot-compile-rpm -%endif %clean rm -rf $RPM_BUILD_ROOT %post %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi %files %defattr(0644,root,root,0755) @@ -153,16 +123,16 @@ fi %{_javadir}/%{base_name}*.jar %{_datadir}/maven2 %{_mavendepmapfragdir} -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* -%endif %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{name} %changelog +* Mon Aug 25 2008 mvyskocil@suse.cz +- target=1.5 source=1.5 +- remove a gcj build support +- fixed some rpmlint warnings * Thu Mar 13 2008 mvyskocil@suse.cz - Initial package build of version 1.0 (jpackage 1.7)