[jetty] Fix BR typ on javapackages-tools
by Stanislav Ochotnicky
commit 60e765bebfade8b9c3625c2b362d5f11d13096c4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Nov 5 17:28:58 2012 +0100
Fix BR typ on javapackages-tools
jetty.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 70a7f8f..e89c9c4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -74,7 +74,7 @@ BuildRequires: glassfish-jsp-api
BuildRequires: jakarta-taglibs-standard
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
-BuildRequires: jpackages-tools >= 0.7.0
+BuildRequires: javapackages-tools >= 0.7.0
BuildRequires: jvnet-parent
BuildRequires: maven
BuildRequires: maven-dependency-plugin
11 years, 5 months
[jetty] Use file lists generated by improved add_maven_depmap macro
by Stanislav Ochotnicky
commit 6405e95801355483d64642f5fa75acbf00106d61
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Nov 5 17:12:21 2012 +0100
Use file lists generated by improved add_maven_depmap macro
jetty.spec | 178 ++++++++++++------------------------------------------------
1 files changed, 35 insertions(+), 143 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index a1abaa3..70a7f8f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -51,7 +51,7 @@
Name: jetty
Version: 8.1.5
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -74,6 +74,7 @@ BuildRequires: glassfish-jsp-api
BuildRequires: jakarta-taglibs-standard
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
+BuildRequires: jpackages-tools >= 0.7.0
BuildRequires: jvnet-parent
BuildRequires: maven
BuildRequires: maven-dependency-plugin
@@ -884,7 +885,7 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
/bin/systemctl try-restart jetty.service >/dev/null 2>&1 || :
-%files
+%files -f .mfiles
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}
%{_bindir}/*
@@ -897,155 +898,43 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%ghost %dir %attr(755, jetty, jetty) %{rundir}
%{appdir}
%{_unitdir}/%{name}.service
-%{_javadir}/%{name}/%{name}-start.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-start.pom
-%{_mavendepmapfragdir}/%{name}
-%files project
+%files project -f .mfiles-project
%doc NOTICE.txt README.txt VERSION.txt LICENSE*
%dir %{_javadir}/%{name}
-%{_mavenpomdir}/JPP.%{name}-project.pom
-%{_mavendepmapfragdir}/%{name}-project
-
-%files ajp
-%{_javadir}/%{name}/%{name}-ajp.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-ajp.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-ajp
-
-%files annotations
-%{_javadir}/%{name}/%{name}-annotations.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-annotations.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-annotations
-
-%files client
-%{_javadir}/%{name}/%{name}-client.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-client.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-client
-
-%files continuation
-%{_javadir}/%{name}/%{name}-continuation.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-continuation.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-continuation
-
-%files deploy
-%{_javadir}/%{name}/%{name}-deploy.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-deploy.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-deploy
-
-%files http
-%{_javadir}/%{name}/%{name}-http.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-http.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-http
-
-%files http-spi
-%{_javadir}/%{name}/%{name}-http-spi.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-http-spi.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-http-spi
-
-%files io
-%{_javadir}/%{name}/%{name}-io.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-io.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-io
-
-%files jaspi
-%{_javadir}/%{name}/%{name}-jaspi.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-jaspi.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-jaspi
-
-%files jmx
-%{_javadir}/%{name}/%{name}-jmx.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-jmx.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-jmx
-
-%files jndi
-%{_javadir}/%{name}/%{name}-jndi.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-jndi.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-jndi
-
-%files monitor
-%{_javadir}/%{name}/%{name}-monitor.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-monitor.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-monitor
-
-%files nested
-%{_javadir}/%{name}/%{name}-nested.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-nested.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-nested
-
-%files overlay-deployer
-%{_javadir}/%{name}/%{name}-overlay-deployer.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-overlay-deployer.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-overlay-deployer
-
-%files plus
-%{_javadir}/%{name}/%{name}-plus.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-plus.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-plus
-
-%files policy
-%{_javadir}/%{name}/%{name}-policy.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-policy.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-policy
-
-%files rewrite
-%{_javadir}/%{name}/%{name}-rewrite.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-rewrite.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-rewrite
-
-%files security
-%{_javadir}/%{name}/%{name}-security.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-security.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-security
-
-%files server
-%{_javadir}/%{name}/%{name}-server.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-server.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-server
-
-%files servlet
-%{_javadir}/%{name}/%{name}-servlet.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-servlet.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-servlet
-
-%files servlets
-%{_javadir}/%{name}/%{name}-servlets.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-servlets.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-servlets
-
-%files util
-%{_javadir}/%{name}/%{name}-util.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-util.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-util
-
-%files webapp
-%{_javadir}/%{name}/%{name}-webapp.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-webapp.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-webapp
-
-%files websocket
-%{_javadir}/%{name}/%{name}-websocket.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-websocket.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-websocket
-
-%files xml
-%{_javadir}/%{name}/%{name}-xml.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-xml.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-xml
+
+%files ajp -f .mfiles-jetty-ajp
+%files annotations -f .mfiles-jetty-annotations
+%files client -f .mfiles-jetty-client
+%files continuation -f .mfiles-jetty-continuation
+%files deploy -f .mfiles-jetty-deploy
+%files http -f .mfiles-jetty-http
+%files http-spi -f .mfiles-jetty-http-spi
+%files io -f .mfiles-jetty-io
+%files jaspi -f .mfiles-jetty-jaspi
+%files jmx -f .mfiles-jetty-jmx
+%files jndi -f .mfiles-jetty-jndi
+%files monitor -f .mfiles-jetty-monitor
+%files nested -f .mfiles-jetty-nested
+%files overlay-deployer -f .mfiles-jetty-overlay-deployer
+%files plus -f .mfiles-jetty-plus
+%files policy -f .mfiles-jetty-policy
+%files rewrite -f .mfiles-jetty-rewrite
+%files security -f .mfiles-jetty-security
+%files server -f .mfiles-jetty-server
+%files servlet -f .mfiles-jetty-servlet
+%files servlets -f .mfiles-jetty-servlets
+%files util -f .mfiles-jetty-util
+%files webapp -f .mfiles-jetty-webapp
+%files websocket -f .mfiles-jetty-websocket
+%files xml -f .mfiles-jetty-xml
%if %{with nosql}
-%files nosql
-%{_javadir}/%{name}/%{name}-nosql.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-nosql.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-nosql
+%files nosql -f .mfiles-jetty-nosql
%endif
%if %{with osgi}
-%files osgi
-%{_javadir}/%{name}/%{name}-osgi*.jar
-%{_javadir}/%{name}/%{name}-httpservice.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-osgi*.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-httpservice.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-osgi
+%files osgi -f .mfiles-jetty-osgi
%endif
%files javadoc
@@ -1053,6 +942,9 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Nov 5 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.5-9
+- Use file lists generated by improved add_maven_depmap macro
+
* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-8
- Fix build conditionals
11 years, 5 months
[joda-time/el5] fix java version.
by gil
commit ee53e6ad22dfa53d87d5d86184c9131daab9311d
Author: gil <puntogil(a)libero.it>
Date: Sun Nov 4 09:37:37 2012 +0100
fix java version.
joda-time.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/joda-time.spec b/joda-time.spec
index 2894f95..49f6e0c 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -3,7 +3,7 @@
Name: joda-time
Version: 1.5.2
-Release: 9.%{tzversion}%{?dist}
+Release: 10.%{tzversion}%{?dist}
Summary: Java date and time API
Group: Development/Libraries
@@ -15,12 +15,12 @@ Patch0: joda-time-use-system-junit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: java-devel
+BuildRequires: java-devel > 0:1.5.0
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: jpackage-utils
BuildRequires: junit
-Requires: java
+Requires: java > 0:1.5.0
Requires: jpackage-utils
%description
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Nov 04 2012 gil cattaneo <puntogil(a)libero.it> - 1.5.2-10.tzdata2008e
+- fix java version
+
* Sun Oct 14 2012 gil cattaneo <puntogil(a)libero.it> - 1.5.2-9.tzdata2008e
- try to resolved broken dependencies
11 years, 5 months