[apache-commons-jexl] Packaging fixes
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Oct 11 13:25:57 UTC 2011
commit 3d1a28051b26c8c934cbfba11b4285005738ae13
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Oct 11 14:51:49 2011 +0200
Packaging fixes
- New maven macro for depmaps (include a compat depmap) #745118
apache-commons-jexl.spec | 51 ++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
---
diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index 9d26920..b31e5bb 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -11,13 +11,14 @@ URL: http://commons.apache.org/jexl
Source0: http://www.apache.org/dist/commons/jexl/source/%{jarname}-%{version}-src.tar.gz
# Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file
Patch0: %{name}-2.0.1-bsf.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: apache-commons-parent
BuildRequires: maven-release-plugin
BuildRequires: javacc-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven
BuildArch: noarch
@@ -32,12 +33,12 @@ and the Expression Language defined in the JavaServer Pages Standard Tag
Library version 1.1 (JSTL) and JavaServer Pages version 2.0 (JSP). While
inspired by JSTL EL, it must be noted that JEXL is not a compatible
implementation of EL as defined in JSTL 1.1 (JSR-052) or JSP 2.0 (JSR-152).
-For a compatible implementation of these specifications, see the Commons EL
+For a compatible implementation of these specifications, see the Commons EL
project.
JEXL attempts to bring some of the lessons learned by the Velocity community
about expression languages in templating to a wider audience. Commons Jelly
-needed Velocity-ish method access, it just had to have it.
+needed Velocity-ish method access, it just had to have it.
%package javadoc
@@ -59,60 +60,40 @@ find -name '*.txt' -exec sed -i 's/\r//' '{}' +
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
--Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-install javadoc:javadoc
-
+mvn-rpmbuild install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}-%{version}.jar
+cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp target/site/apidocs \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.commons %{jarname} %{version} JPP %{name}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+mkdir -p $RPM_BUILD_ROOT/%{_mavenpomdir}
+cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a 'commons-jexl:commons-jexl'
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_datadir}/maven2/poms/JPP-%{name}.pom
-%{_mavendepmapfragdir}
-%{_javadir}/%{name}-%{version}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}.jar
-%{_javadir}/%{jarname}-%{version}.jar
%{_javadir}/%{jarname}.jar
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Oct 11 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.0.1-4
+- Packaging fixes
+- New maven macro for depmaps (include a compat depmap) #745118
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list