[maven/f17] (3 commits) ...Obsolete and provide maven2
by Stanislav Ochotnicky
Summary of changes:
7dbeeb5... Make javadoc noarch (*)
dd1a604... Make package noarch again to simplify bootstrapping (*)
058da9b... Obsolete and provide maven2 (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 1 month
[maven] Obsolete and provide maven2
by Stanislav Ochotnicky
commit 058da9b05bff4dd52b6c87ae82864c36797f87f9
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon May 14 10:19:19 2012 +0200
Obsolete and provide maven2
maven.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 549b906..81d2d65 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -102,8 +102,10 @@ Requires: xerces-j2
# for noarch->arch change
Obsoletes: %{name} < 0:%{version}-%{release}
-# maven now provides "mvn" script and new maven2 mvn2
-Conflicts: maven2 < 2.2.1-28
+# maven2 bin package no longer exists. Replace it
+# these should be around until F20
+Conflicts: maven2 < 2.2.1-99
+Provides: maven2 = %{version}-%{release}
%description
Maven is a software project management and comprehension tool. Based on the
@@ -357,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-4
+- Obsolete and provide maven2
+
* Thu Mar 29 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-3
- Make package noarch again to simplify bootstrapping
12 years, 1 month
[jetty] Fix start.ini symlink
by Mikolaj Izdebski
commit 54abf506060b8afdc99b00356fa0a3356c2d1606
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon May 14 10:15:08 2012 +0200
Fix start.ini symlink
jetty.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 0bdb44f..edfa7b6 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -652,7 +652,7 @@ echo '# Placeholder configuration file. No default is provided.' > \
# make sure jetty knows where to look for jars
sed -i "1{s:^:lib=%{homedir}/lib\n:}" %{buildroot}%{homedir}/start.ini
mv %{buildroot}%{homedir}/start.ini %{buildroot}%{confdir}
-ln -s %{buildroot}%{confdir}/start.ini %{buildroot}%{homedir}
+ln -s %{confdir}/start.ini %{buildroot}%{homedir}
install -dm 755 %{buildroot}%{_mavenpomdir}
12 years, 1 month
[jetty] Don't install Cygwin-related files
by Mikolaj Izdebski
commit 360edda31ebee3668d73c5e6383251026fd64e17
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon May 14 09:53:38 2012 +0200
Don't install Cygwin-related files
jetty.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index c340386..0bdb44f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -639,6 +639,7 @@ cp %{SOURCE5} %{buildroot}%{_unitdir}/
tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir}
mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/
rm -rf %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}
+rm -f %{buildroot}%{homedir}/bin/*cygwin*
chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
chmod +x djetty
12 years, 1 month
[jetty] Require glassfish-jsp only when jetty-osgi is enabled
by Mikolaj Izdebski
commit 10b6385e94e6e0d0be308450b1aea88a59dc39da
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed May 9 15:07:30 2012 +0200
Require glassfish-jsp only when jetty-osgi is enabled
jetty.spec | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 771f19f..c340386 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -71,8 +71,6 @@ BuildRequires: fedora-usermgmt-devel
BuildRequires: geronimo-annotation
BuildRequires: geronimo-jaspic-spec
BuildRequires: geronimo-jta
-BuildRequires: glassfish-jsp
-BuildRequires: glassfish-jsp-api
BuildRequires: jakarta-taglibs-standard
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
@@ -93,6 +91,8 @@ BuildRequires: tomcat-servlet-3.0-api
%if 0%{?rhel} <= 0
BuildRequires: eclipse-platform
BuildRequires: eclipse-rcp
+BuildRequires: glassfish-jsp
+BuildRequires: glassfish-jsp-api
%endif
# we want javamail not classpathx-javamail
@@ -133,9 +133,6 @@ Requires: jetty-webapp = %{version}-%{release}
Requires: jetty-websocket = %{version}-%{release}
Requires: jetty-xml = %{version}-%{release}
-# needed for jsp to work
-Requires: glassfish-jsp
-Requires: glassfish-jsp-api
# These are not required by main jetty server so we don't require them
# in RPM. Install as necessary
@@ -1004,6 +1001,7 @@ fi
%changelog
* Wed May 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-6
- Move start.ini to /etc
+- Require glassfish-jsp only when jetty-osgi is enabled
* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
- Don't require subpackages not needed by server itself
12 years, 1 month
[jetty] Move start.ini to /etc
by Mikolaj Izdebski
commit facae743ba00a264fb8b7c5488cdef5e91693056
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed May 9 15:04:47 2012 +0200
Move start.ini to /etc
jetty.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 1e7447b..771f19f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -653,6 +653,8 @@ echo '# Placeholder configuration file. No default is provided.' > \
# make sure jetty knows where to look for jars
sed -i "1{s:^:lib=%{homedir}/lib\n:}" %{buildroot}%{homedir}/start.ini
+mv %{buildroot}%{homedir}/start.ini %{buildroot}%{confdir}
+ln -s %{buildroot}%{confdir}/start.ini %{buildroot}%{homedir}
install -dm 755 %{buildroot}%{_mavenpomdir}
@@ -1000,6 +1002,9 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Wed May 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-6
+- Move start.ini to /etc
+
* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
- Don't require subpackages not needed by server itself
- Make jetty look for jars in correct directory
12 years, 1 month
[objenesis] Update to current Java packaging guidelines
by Guido Grazioli
commit 16d6166b282c29867f9badc64018ebe07e6e5783
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Mon May 14 16:58:05 2012 +1000
Update to current Java packaging guidelines
- Remove maven-eclipse-plugin BR
objenesis.spec | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/objenesis.spec b/objenesis.spec
index c80033d..cba4cb5 100644
--- a/objenesis.spec
+++ b/objenesis.spec
@@ -31,7 +31,7 @@
Summary: A library for instantiating Java objects
Name: objenesis
Version: 1.2
-Release: 9%{dist}
+Release: 10%{dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://objenesis.googlecode.com/svn/docs/index.html
@@ -54,7 +54,6 @@ BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
-BuildRequires: maven-eclipse-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
@@ -71,10 +70,7 @@ BuildRequires: asm2
BuildRequires: apache-resource-bundles
Requires: java
-BuildRequires: jpackage-utils
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: jpackage-utils
BuildArch: noarch
@@ -102,7 +98,6 @@ when this is useful:
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
BuildArch: noarch
@@ -144,19 +139,17 @@ mvn-rpmbuild -e \
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -Dp -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
-%add_to_maven_depmap org.objenesis objenesis-parent %{version} JPP %{name}-parent
+%add_maven_depmap JPP-%{name}-parent.pom
install -Dp -m 644 main/target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -Dp -m 644 main/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.objenesis objenesis %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
install -Dp -m 644 tck/target/%{name}-tck-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tck.jar
install -Dp -m 644 tck/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-tck.pom
-%add_to_maven_depmap org.objenesis objenesis-tck %{version} JPP %{name}-tck
+%add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar
# javadoc
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/main
@@ -165,25 +158,22 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/*.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE.txt
%{_javadocdir}/%{name}
%changelog
+* Mon May 14 2012 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-10
+- Update to current Java packaging guidelines
+- Remove maven-eclipse-plugin BR
+
* Mon Feb 20 2012 Jiri Vanek <jvanek(a)redhat.com> 1.2-9
- Added patch2 - JRockitInstantntiatorCharacters.patch to fix unmappable characters
- Added build requires apache-resource-bundles and maven-remote-resources-plugin
12 years, 1 month