From 08cb6fe9d0dbd24e7abfa01a2303fb8be21d4155 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Feb 01 2012 10:46:31 +0000 Subject: Update to final release --- diff --git a/.gitignore b/.gitignore index 1b592e8..dbc2473 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ jetty-6.1.24-src.zip jetty-6.1.26-src.zip /jetty-8.1.0.RC4.tar.bz2 /jetty-8.1.0.RC5.tar.bz2 +/jetty-8.1.0.v20120127.tar.bz2 diff --git a/jetty.spec b/jetty.spec index 35342e4..4af84a6 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,15 +40,17 @@ %global jettylibdir %{_localstatedir}/lib/%{name} %global appdir %{jettylibdir}/webapps +%global addver v20120127 + Name: jetty Version: 8.1.0 -Release: 0.4.rc5%{?dist} +Release: 1%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ -Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-8.1.0.RC5.tar.bz2 +Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-%{version}.%{addver}.tar.bz2 Source1: djetty.script Source2: jetty.init Source3: jetty.logrotate @@ -137,7 +139,7 @@ Group: Documentation %{summary}. %prep -%setup -q -n %{jettyname}-%{version}.RC5 +%setup -q -n %{jettyname}-%{version}.%{addver} for f in $(find . -name "*.?ar"); do rm $f; done find . -name "*.class" -exec rm {} \; @@ -160,12 +162,12 @@ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,} %build #rm -rf ./* -#ln -sf ~/temp/jetty/jetty-8.1.0.RC5.copy/* . +#ln -sf ~/temp/jetty/jetty-8.1.0.%{addver}.copy/* . #exit 0 # remove previous lines! sed -i -e "s|/usr/share|%{_datadir}|g" djetty -mvn-rpmbuild -e \ +mvn-rpmbuild -X \ -Dmaven.local.depmap.file=%{SOURCE4} \ -Dmaven.test.skip=true \ install javadoc:aggregate @@ -186,9 +188,9 @@ install -dm 755 %{buildroot}%{rundir} install -dm 755 %{buildroot}%{tempdir} install -dm 755 %{buildroot}%{appdir} # main pkg -tar xvf jetty-distribution/target/%{name}-distribution-%{version}.RC5.tar.gz -C %{buildroot}%{homedir} -mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC5/* %{buildroot}%{homedir}/ -rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC5 +tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir} +mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/ +rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver} chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh chmod +x djetty @@ -207,10 +209,10 @@ for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \ jetty-rewrite jetty-security jetty-server jetty-servlet \ jetty-servlets jetty-util jetty-webapp jetty-websocket \ jetty-xml; do - mv %{buildroot}%{homedir}/lib/$module-%{version}.RC5.jar \ + mv %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar ln -s %{_javadir}/%{name}/$module.jar \ - %{buildroot}%{homedir}/lib/$module-%{version}.RC5.jar + %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar done @@ -218,7 +220,7 @@ done # modules used during build and other jars not included in the # distribution tarball for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do - install $module/target/$module-%{version}.RC5.jar \ + install $module/target/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar @@ -229,7 +231,7 @@ pushd jetty-osgi %add_maven_depmap JPP.%{name}-jetty-osgi.pom for submod in boot boot-jsp boot-warurl;do module=jetty-osgi-$submod - install $module/target/$module-%{version}.RC5.jar \ + install $module/target/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar @@ -237,7 +239,7 @@ pushd jetty-osgi #httpservice is a bit special (for no good reason) module=jetty-httpservice - install jetty-osgi-httpservice/target/$module-%{version}.RC5.jar \ + install jetty-osgi-httpservice/target/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 jetty-osgi-httpservice/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar @@ -265,10 +267,10 @@ done ln -sf $(build-classpath geronimo-jta) \ %{buildroot}%{homedir}/lib/jta/ -mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC5.jar \ +mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/jetty-monitor.jar ln -s %{_javadir}/%{name}/jetty-monitor.jar \ - %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC5.jar + %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.%{addver}.jar install -pm 644 jetty-monitor/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-monitor.pom %add_maven_depmap JPP.%{name}-jetty-monitor.pom %{name}/jetty-monitor.jar @@ -375,6 +377,9 @@ fi %doc %{_javadocdir}/%{name} %changelog +* Wed Feb 1 2012 Stanislav Ochotnicky - 8.1.0-1 +- Update to final release + * Mon Jan 30 2012 Stanislav Ochotnicky - 8.1.0-0.4.rc5 - Fix upgrade path problems - Symlink conf files into etc (so users still see them there) diff --git a/sources b/sources index 6257040..adb0fc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8cdac9d0d2706d597edf64315068dbf jetty-8.1.0.RC5.tar.bz2 +662e42ac878578c69c79140e2733498a jetty-8.1.0.v20120127.tar.bz2