[java-sig-commits] [apache-commons-fileupload] Fix build and update to latest guidelines
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Mar 2 16:40:53 UTC 2012
commit 59c580af315f23bdf92da5ca9676c17dd3edb2bb
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Mar 2 17:40:11 2012 +0100
Fix build and update to latest guidelines
apache-commons-fileupload.spec | 66 +++++++++++----------------------------
commons-fileupload.depmap | 12 -------
2 files changed, 19 insertions(+), 59 deletions(-)
---
diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec
index d918907..25839a0 100644
--- a/apache-commons-fileupload.spec
+++ b/apache-commons-fileupload.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: This package provides an api to work with html file upload
License: ASL 2.0
Group: Development/Libraries
@@ -38,10 +38,7 @@ BuildRequires: maven-surefire-maven-plugin
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: apache-commons-io
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: jakarta-%{short_name} = 1:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 1:1.2.1-2
@@ -78,75 +75,50 @@ rm -f src/test/org/apache/commons/fileupload/*Portlet*
# -----------------------------------------------------------------------------
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
# -----------------------------------------------------------------------------
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
+ ln -sf %{name}.jar %{short_name}.jar
popd # come back from javadir
# javadoc
-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}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-# -----------------------------------------------------------------------------
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-# -----------------------------------------------------------------------------
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*.pom
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{short_name}.pom
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Fri Mar 2 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> 1.2.2-4
+- Fix build and update to latest guidelines
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -178,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-8.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:1.0-7.3
+* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:1.0-7.3
- drop repotag
- fix license tag
More information about the java-sig-commits
mailing list