[plexus-xmlrpc] Remvoe ant build support
by Stanislav Ochotnicky
commit 4e1ab494a09ffc27437b85dd34348ce8f4af8cd4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 16 09:29:44 2011 +0200
Remvoe ant build support
fix few rpmlint problems
plexus-xmlrpc-1.0-build.xml | 121 -------------------------------------------
plexus-xmlrpc.spec | 52 +++++-------------
2 files changed, 15 insertions(+), 158 deletions(-)
---
diff --git a/plexus-xmlrpc.spec b/plexus-xmlrpc.spec
index 2bcdc55..3eacb25 100644
--- a/plexus-xmlrpc.spec
+++ b/plexus-xmlrpc.spec
@@ -28,11 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-%global with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%global without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
%global parent plexus
%global subname xmlrpc
@@ -42,12 +37,11 @@ Release: 0.6.b4.3%{?dist}
Epoch: 0
Summary: Plexus XML RPC Component
License: ASL 1.1 and MIT
-Group: Development/Java
+Group: Development/Libraries
URL: http://plexus.codehaus.org/
# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-xmlrpc-1.0-beta-4/
# tar czf plexus-xmlrpc-1.0-beta-4-src.tar.gz plexus-xmlrpc-1.0-beta-4/
Source0: plexus-xmlrpc-1.0-beta-4-src.tar.gz
-Source1: %{name}-1.0-build.xml
Patch0: %{name}-add-codec-dep.patch
@@ -56,7 +50,6 @@ BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: ant-nodeps
-%if %{with_maven}
BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -67,7 +60,6 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-%endif
BuildRequires: classworlds >= 0:1.1
BuildRequires: apache-commons-codec
BuildRequires: plexus-container-default
@@ -91,7 +83,7 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
Requires: jpackage-utils
%description javadoc
@@ -100,30 +92,11 @@ Javadoc for %{name}.
%prep
%setup -q -n plexus-xmlrpc-1.0-beta-4
-cp %{SOURCE1} build.xml
%patch0 -b .sav
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-%if %{with_maven}
- mvn-rpmbuild \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:aggregate
-%else
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-commons-codec \
-plexus/container-default \
-plexus/utils \
-xmlrpc \
-
-ant jar javadoc
-%endif
+mvn-rpmbuild -e install javadoc:aggregate
%install
# jars
@@ -136,19 +109,24 @@ install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
# javadoc
-install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
-%{_javadir}/*
-%{_mavenpomdir}/*
%doc LICENSE.txt
-%{_mavendepmapfragdir}/plexus-xmlrpc
+%{_javadir}/%{parent}
+%{_mavenpomdir}/JPP.%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.0-0.6.b4.3
12 years, 8 months
[plexus-xmlrpc] plexus-maven-plugin removed (not needed)
by Stanislav Ochotnicky
commit c6ccdf7462ddfcc0376f4a06a4ad274932d7ec7e
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Thu Jul 28 13:54:58 2011 +0200
plexus-maven-plugin removed (not needed)
plexus-xmlrpc.spec | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/plexus-xmlrpc.spec b/plexus-xmlrpc.spec
index d2b9bac..2bcdc55 100644
--- a/plexus-xmlrpc.spec
+++ b/plexus-xmlrpc.spec
@@ -38,7 +38,7 @@
Name: plexus-xmlrpc
Version: 1.0
-Release: 0.5.b4.3%{?dist}
+Release: 0.6.b4.3%{?dist}
Epoch: 0
Summary: Plexus XML RPC Component
License: ASL 1.1 and MIT
@@ -57,7 +57,7 @@ BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: ant-nodeps
%if %{with_maven}
-BuildRequires: maven2 >= 2.0.4-9
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -67,7 +67,6 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: plexus-maven-plugin
%endif
BuildRequires: classworlds >= 0:1.1
BuildRequires: apache-commons-codec
@@ -81,9 +80,6 @@ Requires: plexus-container-default
Requires: plexus-utils
Requires: xmlrpc
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -113,10 +109,10 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
%if %{with_maven}
- mvn-jpp \
+ mvn-rpmbuild \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+ install javadoc:aggregate
%else
mkdir -p target/lib
build-jar-repository -s -p target/lib \
@@ -130,30 +126,21 @@ ant jar javadoc
%endif
%install
-rm -rf $RPM_BUILD_ROOT
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+install -d -m 755 %{buildroot}/%{_javadir}/plexus
install -pm 644 target/plexus-xmlrpc-%{version}-beta-4.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/xmlrpc.jar
-%add_to_maven_depmap org.codehaus.plexus plexus-xmlrpc 1.0-beta-4 JPP/plexus xmlrpc
+ %{buildroot}/%{_javadir}/plexus/xmlrpc.jar
#poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.plexus-xmlrpc.pom
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
+%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
# 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}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%doc LICENSE.txt
@@ -161,10 +148,14 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.0-0.6.b4.3
+- Migration to maven3
+- Removal of plexus-maven-plugin (not needed)
+- Minor spec file changes according to the latest guidelines
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.5.b4.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 8 months
[tomcat/f15] (73 commits) ...Require java = 1:1.6.0
by Ivan Afonichev
Summary of changes:
36c4ac2... Setup of module tomcat6 (*)
30340fb... initial import of 6.0.16-1jpp.7%{?dist} (rhbz #435829) (*)
372ace3... fix repotag (*)
f2e7822... - 6.0.18 - Resolves: CVE-2008-1232, CVE-2008-1947, CVE-2008 (*)
41ff5cd... - use lsb_release instead of lsb-release to get the distrib (*)
a2e5388... - use Fedora-specific changes to force java 1.6.0 (*)
75f506c... - build 0:6.0.18-8 for Fedora (*)
94f127f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass (*)
f999669... Add OSGi manifest for servlet-api. (*)
e486aca... - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass (*)
13cd2e8... Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580. (*)
107267a... Fix typo that causes a failure to update the common directo (*)
82d42b1... Drop file requires on /usr/share/java/ecj.jar. (*)
3652da7... Update to 6.0.24. (*)
2ed3aec... Add maven metadata and copy tomcat-juli.jar into /usr/share (*)
850f211... Linking tomcat-juli instead of copying (*)
2cdbc95... Source0 updated to tomcat 6.0.26. OSGi manifests for servle (*)
ec08b5c... Had to rework this patch because of changes to the manifest (*)
d71f034... Adding Requires and BuildRequires for taglibs-standard. (*)
41fbc27... Incrementing the Release tag to 3 and avoid any confusion a (*)
fa747cf... Moved build-jar-repository to later in the install process (*)
d2e4841... Added missing packages. Filled out %%files sections. Fixed (*)
431c79f... Made elspec the standard for elspec %post and %postun (*)
186acca... corrections for LSB compliance (*)
5a3944a... corrections for LSB compliance. Increment tag. (*)
429e852... dist-git conversion (*)
e4a5862... Resolves rhbz575341 (*)
fdab689... Changelog entry for rhbz#575341 (*)
0d7ab63... Change the release this time. (*)
1bb926e... adding cve-2010-2227.patch and resolving rhbz#575341 (*)
5fa3921... resolves: rhbz#640837 (*)
e7dc4cc... - Resolves rhbz#640686 - Upgrade of tomcat6 wipes out direc (*)
1bb32f3... Update Release this time (*)
efc5847... Added javax.servlet:servlet-api depmap entry to servlet-2.5 (*)
ae16f6a... Resolves rhbz 604686 (*)
980e758... Fix log4j symlink (Resolves rhbz#654660) (*)
02259b0... Simplify pom installation by splitting to more steps (*)
8ebe651... Formatting cleanups and jakarta-commons->apache-commons ren (*)
5746174... Removed log4j sub-package with bundled log4j (replaced by s (*)
89cd8ca... Fixes according to guidelines (*)
9f57789... Add changelog entry for past changes (*)
3c9662b... Add jetty to servlet-api depmap (*)
fb3cd5e... Add api jars without spec version symlinks (*)
7f5f5fa... Update to new upstream. (*)
6b3301f... Resolves: rhbz#66969 - tomcat-jdbc missing. Resolves proble (*)
0e9407e... Resolves rhbz 674601 JDK Double.parseDouble DoS (*)
a1884b9... Adding the patch (*)
477b5e9... Update to 6.0.30. (*)
b6cdbc0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
3cb34c7... Rebased on tomcat 6.0.32. Corrected order of config files i (*)
eea1f30... merged auto message with current build (*)
4aa2b84... resolves rhbz 640134 (*)
6dbb0bd... cleaning up spec and correcting nvr. resolving rhbz 640134 (*)
fc407ac... resolves rhbz 681677 (*)
52d7198... update release this time (*)
6a7af86... Fixed typo in init (*)
8ee4662... In useradd, set daemon shell to nologin (*)
74a4175... rhbz 693292:manager app doesn't work (directory permissions (*)
167370b... Tomcat 7 (*)
5b34837... - Package now named just tomcat instead of tomcat7 - Remove (*)
468fdba... - Fixed package groups - Fixed some permissions - Fixed som (*)
31d304e... - Provided local paths for libs - Fixed dependencies - Fixe (*)
b44b78b... Switched to 7.0.14 (*)
5f0fcd8... - Fixed http source link - Securify some permissions - Adde (*)
8b8a735... universify .gitignore (*)
a2503e3... Merge branch 'master' of ssh://pkgs.fedoraproject.org/tomca (*)
ccbc5a8... Remove old tarball from sources. (*)
ca271e5... - Added initial systemd service - Fix some paths (*)
bdc086f... Updated to 7.0.16 (*)
d07c057... Updated to 7.0.19 (*)
f0cf232... Updated to 7.0.20 (*)
0091331... Require java < 1.7.0 (*)
3137597... Require java = 1:1.6.0 (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 8 months
[tomcat] Require java = 1:1.6.0
by Ivan Afonichev
commit 31375978bd3bb680b109bb9d2cbce0c2120c2a8c
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Tue Aug 16 00:22:02 2011 +0400
Require java = 1:1.6.0
tomcat.spec | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index b42592b..b83e789 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -86,8 +86,7 @@ BuildRequires: apache-commons-daemon
BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-pool
BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: java-devel < 1:1.7.0
+BuildRequires: java-devel = 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
BuildRequires: log4j
@@ -98,8 +97,7 @@ Requires: apache-commons-logging
Requires: apache-commons-collections
Requires: apache-commons-dbcp
Requires: apache-commons-pool
-Requires: java >= 1:1.6.0
-Requires: java < 1:1.7.0
+Requires: java = 1:1.6.0
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires(pre): shadow-utils
@@ -567,6 +565,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.20-3
+- Require java = 1:1.6.0
+
* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.20-2
- Require java < 1.7.0
12 years, 8 months
[tomcat] Require java < 1.7.0
by Ivan Afonichev
commit 009133147f66bdb56b3b36d2df4e877deda83709
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Aug 15 23:28:31 2011 +0400
Require java < 1.7.0
tomcat.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 35f3545..b42592b 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -86,7 +86,8 @@ BuildRequires: apache-commons-daemon
BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-pool
BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-devel < 1:1.7.0
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
BuildRequires: log4j
@@ -98,6 +99,7 @@ Requires: apache-commons-collections
Requires: apache-commons-dbcp
Requires: apache-commons-pool
Requires: java >= 1:1.6.0
+Requires: java < 1:1.7.0
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires(pre): shadow-utils
@@ -565,6 +567,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.20-2
+- Require java < 1.7.0
+
* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.20-1
- Updated to 7.0.20
12 years, 8 months