[plexus-mail-sender] Fix build and install proper pom files
by Stanislav Ochotnicky
commit 9d486aa87aa0d816242a4cda7d132be88679ff3c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Mar 2 18:56:11 2012 +0100
Fix build and install proper pom files
plexus-mail-sender.spec | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index 9f5dd5c..3ed6545 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.20%{?dist}.1
+Release: 0.a2.21%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -65,9 +65,6 @@ BuildRequires: saxon
BuildRequires: saxon-scripts
BuildRequires: java-devel >= 1:1.6.0
-# just one-off remove during next rebuild!
-BUildRequires: plexus-mail-sender
-
Requires: java
Requires: jpackage-utils
@@ -95,9 +92,24 @@ Javadoc for %{name}.
%setup -q -n %{name}-%{version}-a2
%patch0 -p3
+mv release-pom.xml pom.xml
+
+pushd plexus-mail-senders
+mv release-pom.xml pom.xml
+for mod in javamail simple test;do
+ pushd %{name}-$mod
+ mv release-pom.xml pom.xml
+ popd
+done
+popd
+
+mv %{name}-api/release-pom.xml %{name}-api/pom.xml
+find . -iname 'pom.xml' -exec sed -i \
+ 's:<groupId>plexus</groupId>:<groupId>org.codehaus.plexus</groupId>:g' \{\} \;
+
+
%build
mvn-rpmbuild \
- -Dmaven.local.debug=true \
-Dmaven.local.depmap.file="%{SOURCE2}" \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -109,20 +121,22 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
pushd plexus-mail-senders
for mod in javamail simple test;do
pushd %{name}-$mod
- install -pm 644 target/%{name}-$mod-%{namedversion}.jar \
+ install -pm 644 target/%{name}-$mod-%{namedversion}*.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
- install -pm 644 release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
- %add_maven_depmap JPP.%{name}-$mod.pom plexus/mail-sender-$mod.jar -a "org.codehaus.plexus:plexus-mail-sendser-$mod"
+ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
+ %add_maven_depmap JPP.%{name}-$mod.pom plexus/mail-sender-$mod.jar -a "org.codehaus.plexus:plexus-mail-sender-$mod"
popd
done
popd
install -pm 644 \
- %{name}-api/target/%{name}-api-%{namedversion}.jar \
+ %{name}-api/target/%{name}-api-%{namedversion}*.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
-install -pm 644 %{name}-api/release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
-%add_maven_depmap JPP.%{name}-api.pom plexus/mail-sender-api.jar
+install -pm 644 %{name}-api/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
+%add_maven_depmap JPP.%{name}-api.pom plexus/mail-sender-api.jar -a "org.codehaus.plexus:plexus-mail-sender-api"
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender.pom
+%add_maven_depmap JPP.%{name}.pom -a "org.codehaus.plexus:plexus-mail-sender"
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -138,6 +152,9 @@ cp -pr target/site/apidocs/* \
%{_javadocdir}/%{name}
%changelog
+* Fri Mar 2 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> 0:1.0-0.a2.21
+- Fix build and install proper pom files
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.a2.20.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
[apache-commons-jxpath] Fix build and update to latest guidelines
by Stanislav Ochotnicky
commit f9c4d107756a80a5b0f09b7b96a023f849e0e48c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Mar 2 17:53:22 2012 +0100
Fix build and update to latest guidelines
apache-commons-jxpath.spec | 59 +++++++++++++------------------------------
1 files changed, 18 insertions(+), 41 deletions(-)
---
diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec
index 862270f..95b3634 100644
--- a/apache-commons-jxpath.spec
+++ b/apache-commons-jxpath.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Simple XPath interpreter
Group: Development/Libraries
@@ -38,11 +38,6 @@ Requires: jdom >= 0:1.0
Requires: apache-commons-beanutils
Requires: apache-commons-logging
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
# This should go away with F-17
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
@@ -69,68 +64,50 @@ This package contains the API documentation for %{name}.
%patch0 -p1
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
# we are skipping tests because we don't have com.mockrunner in repos yet
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file="%{SOURCE1}" \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -Dpm 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 -sf %{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}
# Install pom
# 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
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
%changelog
+* Fri Mar 2 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> 1.3-8
+- Fix build and update to latest guidelines
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
[apache-commons-fileupload] Fix build and update to latest guidelines
by Stanislav Ochotnicky
commit 59c580af315f23bdf92da5ca9676c17dd3edb2bb
Author: Stanislav Ochotnicky <sochotnicky(a)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(a)redhat.com> 1.2.2-4
+- Fix build and update to latest guidelines
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)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(a)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(a)redhat.com> - 1:1.0-7.3
+* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1:1.0-7.3
- drop repotag
- fix license tag
12 years, 2 months
[aqute-bnd] Fixing build failures on f16 and later
by Jaromír Cápík
commit 872fa57876e374fe882f9d7cac6f9af7bd1d1f23
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Fri Mar 2 17:26:01 2012 +0100
Fixing build failures on f16 and later
aqute-bnd.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 4b573bb..a7ab067 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -30,7 +30,7 @@
Name: aqute-bnd
Version: 0.0.363
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: BND Tool
License: ASL 2.0
Group: Development/Tools
@@ -117,7 +117,7 @@ CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.console_*.j
CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.editors_*.jar)
CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jdt.core_*.jar)
CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar)
CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar)
CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar)
@@ -161,6 +161,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Fri Mar 02 2012 Jaromir Capik <jcapik(a)redhat.com> - 0.0.363-5
+- Fixing build failures on f16 and later
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.0.363-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
