[apache-commons-net] Use maven 3 to build Packaging fixes according to latest guidelines
by Stanislav Ochotnicky
commit 64a3b17a873c96a6b56af4cc6ea79a1bee768798
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Nov 24 16:20:42 2011 +0100
Use maven 3 to build
Packaging fixes according to latest guidelines
apache-commons-net.spec | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index 2647933..47d607e 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Internet protocol suite Java library
License: ASL 2.0
Group: Development/Libraries
@@ -22,9 +22,6 @@ BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.7.2
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:2.0-3
@@ -56,9 +53,8 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
# test.failure.ignore added because package would not build on koji
# with TimeTCPClientTest failing
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.failure.ignore=true \
+ install javadoc:aggregate
%install
# jars
@@ -70,41 +66,33 @@ ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{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 %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2-3
+- Use maven 3 to build
+- Packaging fixes according to latest guidelines
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 6 months
[maven-surefire] Move poms and depmaps to respective sub-packages Add requires on junit provider to maven-plugin
by Stanislav Ochotnicky
commit 7034107248d90921b6b56fe31f9c91075bec00a5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Nov 24 09:59:42 2011 +0100
Move poms and depmaps to respective sub-packages
Add requires on junit provider to maven-plugin
maven-surefire.spec | 53 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 15 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index bca2913..6434a1a 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
Version: 2.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
@@ -64,6 +64,7 @@ Surefire is a test framework project.
Summary: Surefire plugin for maven
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-provider-junit = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire <= 0:2.0.4
Provides: maven2-plugin-surefire = %{epoch}:%{version}-%{release}
Obsoletes: maven-surefire-maven-plugin < 0:2.6
@@ -167,8 +168,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin.jar
install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-maven-plugin.pom
-install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven2.plugins-surefire-plugin.pom
-%add_maven_depmap JPP.maven-surefire-maven-plugin.pom maven-surefire/maven-plugin.jar
+%add_maven_depmap JPP.maven-surefire-maven-plugin.pom maven-surefire/maven-plugin.jar -f maven-plugin
install -pm 644 maven-surefire-common/target/maven-surefire-common-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common.jar
install -pm 644 maven-surefire-common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common.pom
@@ -176,7 +176,7 @@ install -pm 644 maven-surefire-common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP
install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin.jar
install -pm 644 maven-surefire-report-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-report-maven-plugin.pom
-%add_maven_depmap JPP.maven-surefire-report-maven-plugin.pom maven-surefire/report-maven-plugin.jar
+%add_maven_depmap JPP.maven-surefire-report-maven-plugin.pom maven-surefire/report-maven-plugin.jar -f report-plugin
install -pm 644 surefire-api/target/original-surefire-api-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api.jar
install -pm 644 surefire-api/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-api.pom
@@ -188,38 +188,38 @@ install -pm 644 surefire-booter/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven
install -pm 644 surefire-providers/common-junit3/target/common-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit.jar
install -pm 644 surefire-providers/common-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit.pom
-%add_maven_depmap JPP.maven-surefire-common-junit.pom maven-surefire/common-junit.jar
+%add_maven_depmap JPP.maven-surefire-common-junit.pom maven-surefire/common-junit.jar -f junit
install -pm 644 surefire-providers/surefire-junit3/target/original-surefire-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit.jar
install -pm 644 surefire-providers/surefire-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit.pom
-%add_maven_depmap JPP.maven-surefire-junit.pom maven-surefire/junit.jar -a "org.apache.maven.surefire:surefire-junit"
+%add_maven_depmap JPP.maven-surefire-junit.pom maven-surefire/junit.jar -a "org.apache.maven.surefire:surefire-junit" -f junit
install -pm 644 surefire-providers/common-junit4/target/common-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit4.jar
install -pm 644 surefire-providers/common-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit4.pom
-%add_maven_depmap JPP.maven-surefire-common-junit4.pom maven-surefire/common-junit4.jar
+%add_maven_depmap JPP.maven-surefire-common-junit4.pom maven-surefire/common-junit4.jar -f junit4
install -pm 644 surefire-providers/surefire-junit4/target/original-surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4.jar
install -pm 644 surefire-providers/surefire-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit4.pom
-%add_maven_depmap JPP.maven-surefire-junit4.pom maven-surefire/junit4.jar
+%add_maven_depmap JPP.maven-surefire-junit4.pom maven-surefire/junit4.jar -f junit4
install -pm 644 surefire-providers/surefire-junit47/target/original-surefire-junit47-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit47.jar
install -pm 644 surefire-providers/surefire-junit47/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit47.pom
-%add_maven_depmap JPP.maven-surefire-junit47.pom maven-surefire/junit47.jar
+%add_maven_depmap JPP.maven-surefire-junit47.pom maven-surefire/junit47.jar -f junit4
install -pm 644 surefire-providers/surefire-testng/target/surefire-testng-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng.jar
install -pm 644 surefire-providers/surefire-testng/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-testng.pom
-%add_maven_depmap JPP.maven-surefire-testng.pom maven-surefire/testng.jar
+%add_maven_depmap JPP.maven-surefire-testng.pom maven-surefire/testng.jar -f testng
install -pm 644 surefire-providers/surefire-testng-utils/target/surefire-testng-utils-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng-utils.jar
install -pm 644 surefire-providers/surefire-testng-utils/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-testng-utils.pom
-%add_maven_depmap JPP.maven-surefire-testng-utils.pom maven-surefire/testng-utils.jar
+%add_maven_depmap JPP.maven-surefire-testng-utils.pom maven-surefire/testng-utils.jar -f testng
install -pm 644 surefire-providers/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-providers.pom
%add_maven_depmap JPP.maven-surefire-providers.pom
install -pm 644 maven-failsafe-plugin/target/maven-failsafe-plugin*.jar $RPM_BUILD_ROOT%{_javadir}/maven-failsafe-plugin.jar
install -pm 644 maven-failsafe-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-maven-failsafe-plugin.pom
-%add_maven_depmap JPP-maven-failsafe-plugin.pom maven-failsafe-plugin.jar
+%add_maven_depmap JPP-maven-failsafe-plugin.pom maven-failsafe-plugin.jar -f failsafe-plugin
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-main.pom
%add_maven_depmap JPP.maven-surefire-main.pom
@@ -244,46 +244,69 @@ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
%dir %{_javadir}/maven-surefire
%{_javadir}/maven-surefire/api.jar
%{_javadir}/maven-surefire/booter.jar
%{_javadir}/maven-surefire/surefire.jar
%{_javadir}/maven-surefire/common.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP.%{name}-api.pom
+%{_mavenpomdir}/JPP.%{name}-booter.pom
+%{_mavenpomdir}/JPP.%{name}-common.pom
+%{_mavenpomdir}/JPP.%{name}-main.pom
+%{_mavenpomdir}/JPP.%{name}-providers.pom
+%{_mavendepmapfragdir}/%{name}
%files plugin
%{_javadir}/maven-surefire/maven-plugin.jar
+%{_mavenpomdir}/JPP.%{name}-maven-plugin.pom
+%{_mavendepmapfragdir}/%{name}-maven-plugin
%dir %{_datadir}/maven2/plugins
%{_datadir}/maven2/plugins/surefire-plugin.jar
%files report-plugin
%{_javadir}/maven-surefire/report-maven-plugin.jar
+%{_mavenpomdir}/JPP.%{name}-report-maven-plugin.pom
+%{_mavendepmapfragdir}/%{name}-report-plugin
%dir %{_datadir}/maven2/plugins
%{_datadir}/maven2/plugins/surefire-report-plugin.jar
%files provider-junit
+%{_mavendepmapfragdir}/%{name}-junit
+%{_mavenpomdir}/JPP.%{name}-junit.pom
+%{_mavenpomdir}/JPP.%{name}-common-junit.pom
%{_javadir}/maven-surefire/junit.jar
%{_javadir}/maven-surefire/common-junit.jar
%files provider-junit4
+%{_mavendepmapfragdir}/%{name}-junit4
+%{_mavenpomdir}/JPP.%{name}-junit4.pom
+%{_mavenpomdir}/JPP.%{name}-junit47.pom
+%{_mavenpomdir}/JPP.%{name}-common-junit4.pom
%{_javadir}/maven-surefire/junit4.jar
%{_javadir}/maven-surefire/junit47.jar
%{_javadir}/maven-surefire/common-junit4.jar
%files provider-testng
+%{_mavendepmapfragdir}/%{name}-testng
+%{_mavenpomdir}/JPP.%{name}-testng.pom
+%{_mavenpomdir}/JPP.%{name}-testng-utils.pom
%{_javadir}/maven-surefire/testng.jar
%{_javadir}/maven-surefire/testng-utils.jar
%files -n maven-failsafe-plugin
+%{_mavendepmapfragdir}/%{name}-failsafe-plugin
+%{_mavenpomdir}/JPP-maven-failsafe-plugin.pom
%{_javadir}/maven-failsafe-plugin.jar
%files javadoc
%doc %{_javadocdir}/*
%changelog
+* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.10-4
+- Move poms and depmaps to respective sub-packages
+- Add requires on junit provider to maven-plugin
+
* Wed Oct 5 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.10-3
- Fix junit4 depmap provider macro
- Remove unused patches
12 years, 6 months
[maven-shade-plugin] Fix depmap macro call
by Stanislav Ochotnicky
commit 10bcf52450c1b009dd7bf2ad265968c1c8e4cca6
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Nov 23 18:28:07 2011 +0100
Fix depmap macro call
maven-shade-plugin.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 9460064..2df350b 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-shade-plugin
Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries
@@ -52,7 +52,7 @@ Requires: jpackage-utils
%{summary}.
%prep
-%setup -q
+%setup -q
rm src/test/jars/plexus-utils-1.4.1.jar
ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
@@ -66,7 +66,7 @@ install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -84,6 +84,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%doc LICENSE
%changelog
+* Wed Nov 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5-2
+- Fix depmap macro call
+
* Tue Nov 1 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.5-1
- Update to upstream 1.5 release.
12 years, 6 months
[apache-commons-beanutils] Packaging fixes
by Stanislav Ochotnicky
commit 77fab564e3bd0c543b32a35b2838c01a153514fc
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 22 14:46:13 2011 +0100
Packaging fixes
- Remove unneeded depmap
- Remove versioned jars and javadocs
- Use maven 3 to build
apache-commons-beanutils.spec | 103 ++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 57 deletions(-)
---
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index dc26901..d138bcd 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.8.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
License: ASL 2.0
Group: Development/Libraries
@@ -12,33 +12,30 @@ URL: http://commons.apache.org/%{base_name}
BuildArch: noarch
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
# this will not be needed after commons-collections have proper pom
-Source1: %{short_name}.depmap
BuildRequires: apache-commons-logging >= 0:1.0
BuildRequires: java >= 1:1.6.0
BuildRequires: jpackage-utils > 0:1.7.2
+BuildRequires: maven
BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
#change to apache-commons-collections once transition is done
-BuildRequires: jakarta-commons-collections-testframework >= 0:2.0
-BuildRequires: jakarta-commons-collections >= 0:2.0
-Requires: jakarta-commons-collections >= 0:2.0
+BuildRequires: apache-commons-collections-testframework >= 0:2.0
+BuildRequires: apache-commons-collections >= 0:2.0
+Requires: apache-commons-collections >= 0:2.0
Requires: apache-commons-logging >= 0:1.0
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Requires: java >= 1:1.6.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This should go away with F-17
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
@@ -71,73 +68,65 @@ sed -i 's/\r//' *.txt
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
# test failures ignored because they are caused by mock
-mvn-jpp -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
- -Dmaven.test.failure.ignore=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.failure.ignore=true \
+ install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 target/%{short_name}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections-%{version}.jar
-install -m 644 target/%{short_name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar
+install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# main jar created from these, we install them just for safe measure
+install -m 644 target/%{short_name}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections.jar
+install -m 644 target/%{short_name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
+for jar in *.jar; 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
popd # come back from javadir
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-%add_to_maven_depmap org.apache.commons %{short_name}-core %{version} JPP %{short_name}
-%add_to_maven_depmap org.apache.commons %{short_name}-bean-collections %{version} JPP %{short_name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name}-core,%{short_name}:%{short_name}-bean-collections"
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name},org.apache.commons:%{short_name}-core,org.apache.commons:%{short_name}-bean-collections"
-# following lines are 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}
-%add_to_maven_depmap %{short_name} %{short_name}-core %{version} JPP %{short_name}
-%add_to_maven_depmap %{short_name} %{short_name}-bean-collections %{version} JPP %{short_name}
# 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} %{buildroot}%{_javadocdir}/%{name}
-
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{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 *.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/*.pom
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{short_name}.jar
+%{_javadir}/%{short_name}-core.jar
+%{_javadir}/%{short_name}-bean-collections.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-core.jar
+%{_javadir}/%{name}-bean-collections.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Tue Nov 22 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.8.3-5
+- Packaging fixes
+- Remove unneeded depmap
+- Remove versioned jars and javadocs
+- Use maven 3 to build
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -283,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
- use sed instead of bash 2.x extension in link area to make spec compatible
with distro using bash 1.1x
-* Fri Jun 07 2002 Henri Gomez <hgomez(a)users.sourceforge.net> 1.3-1jpp
+* Fri Jun 07 2002 Henri Gomez <hgomez(a)users.sourceforge.net> 1.3-1jpp
- 1.3
- added short names in %%{_javadir}, as does jakarta developpers
- first jPackage release
12 years, 6 months
[ant/f15] Changed file attributes in 'scripts' subpackage
by tradej@fedoraproject.org
commit e78e1aa6538e5ae350af05de674dbdb0dfba45c5
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Nov 21 12:22:14 2011 +0100
Changed file attributes in 'scripts' subpackage
ant.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 11f7ffb..7c2caaf 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -789,9 +789,8 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
%files scripts
-%defattr(-,root,root,-)
-%{_bindir}/*.pl
-%{_bindir}/*.py*
+%attr(0755,root,root) %{_bindir}/*.pl
+%attr(0755,root,root) %{_bindir}/*.py*
%files manual
%defattr(-,root,root,-)
@@ -807,6 +806,9 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Mon Nov 21 2011 Tomas Radej <tradej(a)redhat.com> - 0:1.8.2-4
+- Changed files attributes in the 'scripts' subpackage
+
* Wed Feb 9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.8.2-3
- Add backward compatible maven depmap for nodeps jar
- Revert define->global change (different semantic in rpm 4.9.X)
12 years, 6 months