--- SPECS/eclipse-mylyn.spec 2009-01-06 15:46:03.000000000 +0100 +++ rh/eclipse-mylyn/devel/eclipse-mylyn.spec 2008-11-12 20:22:27.000000000 +0100 @@ -7,13 +7,13 @@ Name: eclipse-mylyn Summary: Mylyn is a task-focused UI for Eclipse Version: 3.0.3 -Release: %mkrel 0.4.0 -License: Eclipse Public License +Release: 4%{?dist} +License: EPL URL: http://www.eclipse.org/mylyn # mkdir temp && cd temp # sh fetch-mylyn.sh -# tar cjf org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 org.eclipse.mylyn +# tar cjf org.eclipse.mylyn-R_3_0_3-fetched-src.tar.bz2 org.eclipse.mylyn Source0: org.eclipse.mylyn-R_3_0_3-fetched-src.tar.bz2 Source1: fetch-mylyn.sh Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip @@ -34,36 +34,34 @@ # for application in %%prep. Patch10: %{name}-largebzconfigs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.5.0 BuildArch: noarch -BuildRequires: java-rpmbuild BuildRequires: eclipse-pde >= 1:3.4.0 BuildRequires: eclipse-cvs-client >= 1:3.4.0 -BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2 -BuildRequires: jakarta-commons-httpclient >= 1:3.1 -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-lang >= 2.1 +BuildRequires: jakarta-commons-codec >= 1.3-9 +BuildRequires: jakarta-commons-httpclient >= 1:3.1-0.3 +BuildRequires: jakarta-commons-logging >= 1.0.4-7.7 +BuildRequires: jakarta-commons-lang >= 2.3-2.3 BuildRequires: ws-commons-util >= 1.0.1-5 -BuildRequires: xmlrpc3-client >= 3.0-1jpp.3 -BuildRequires: xmlrpc3-common >= 3.0-1jpp.3 -BuildRequires: rome -BuildRequires: jdom -BuildRequires: zip -BuildRequires: tomcat5-jsp-2.0-api +BuildRequires: xmlrpc3-client >= 3.0-2.8 +BuildRequires: xmlrpc3-common >= 3.0-2.8 BuildRequires: ws-jaxme >= 0.5.1-2.4 +BuildRequires: rome +BuildRequires: jdom >= 1.0-5.5 Requires: eclipse-platform >= 1:3.4.0 Requires: eclipse-cvs-client >= 1:3.4.0 -Requires: jakarta-commons-codec >= 1.3-8jpp.2 -Requires: jakarta-commons-httpclient >= 1:3.1 -Requires: jakarta-commons-logging -Requires: jakarta-commons-lang >= 2.1 -Requires: ws-commons-util >= 1.0.1-2 -Requires: xmlrpc3-client >= 3.0-1jpp.3 -Requires: xmlrpc3-common >= 3.0-1jpp.3 +Requires: jakarta-commons-codec >= 1.3-9 +Requires: jakarta-commons-httpclient >= 1:3.1-0.3 +Requires: jakarta-commons-logging >= 1.0.4-7.7 +Requires: jakarta-commons-lang >= 2.3-2.3 +Requires: ws-commons-util >= 1.0.1-5 +Requires: xmlrpc3-client >= 3.0-2.8 +Requires: xmlrpc3-common >= 3.0-2.8 +Requires: ws-jaxme >= 0.5.1-2.4 Provides: eclipse-mylar = 2.0.0-1.fc7 Obsoletes: eclipse-mylar < 2.0.0 Provides: eclipse-mylyn-ide = %{version}-%{release} @@ -75,7 +73,7 @@ Provides: eclipse-mylyn-bugzilla = %{version}-%{release} Obsoletes: eclipse-mylyn-bugzilla < 3.0.0 -Group: Development/Java +Group: Development/Tools %description Mylyn integrates task support into Eclipse. It supports offline editing @@ -87,9 +85,9 @@ %package trac Summary: Mylyn Trac Connector Requires: %{name} = %{version}-%{release} -Group: Development/Java -Provides: eclipse-mylar-trac = 0:2.0.0-1 -Obsoletes: eclipse-mylar-trac < 0:2.0.0 +Group: Development/Tools +Provides: eclipse-mylar-trac = 2.0.0-1.fc7 +Obsoletes: eclipse-mylar-trac < 2.0.0 %description trac Trac client integrated with Eclipse and Mylyn; can be used standalone. @@ -98,7 +96,7 @@ Summary: Mylyn Focused UI Requires: eclipse-jdt Requires: %{name}-ide = %{version}-%{release} -Group: Development/Java +Group: Development/Tools %description java Mylyn Task-Focused UI extensions for JDT. Provides focusing of Java @@ -108,7 +106,7 @@ Summary: Mylyn Focused UI Requires: eclipse-pde Requires: %{name}-java = %{version}-%{release} -Group: Development/Java +Group: Development/Tools %description pde Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS. @@ -118,7 +116,7 @@ Requires: %{name} = %{version}-%{release} Requires: rome Requires: jdom -Group: Development/Java +Group: Development/Tools %description webtasks Provides Task List integration for several web-based issue trackers @@ -173,41 +171,41 @@ done %build -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.context_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.context_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.team_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.team_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.bugzilla_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.ide_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.ide_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.trac_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.trac_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.java_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.java_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.pde_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.pde_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -D -f org.eclipse.mylyn.web.tasks_feature \ +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.web.tasks_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java-rpmbuild/jre/lib/rt.jar \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -o `pwd`/orbitDeps %install @@ -250,13 +248,24 @@ ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar popd -#pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/plugins -#rm org.apache.ws.commons.util_1.0.0.v20080716-2300-e3x.jar -#rm org.apache.xmlrpc_3.0.0.v20080716-2300-e3x.jar -#ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar -#ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar -#ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar -#popd +pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/plugins +rm org.apache.ws.commons.util_1.0.0.%{qualifier}.jar +rm org.apache.xmlrpc_3.0.0.%{qualifier}.jar +ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar +ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar +ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar +ln -s %{_javadir}/jaxme/jaxmeapi.jar javax.xml.bind.jar +popd + +#Do not use qualifier value for dependencies to not be forced to rebuild them for +# every mylyn +pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/features + find -name feature.xml | + while read f; do + sed -i "s/3.0.0.%{qualifier}/3.0.0.qualifier/g" $f + sed -i "s/1.0.0.%{qualifier}/1.0.0.qualifier/g" $f + done +popd pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks/eclipse/plugins rm org.jdom_1.0.0.v200806100616.jar @@ -309,3 +318,131 @@ %{install_loc}/mylyn # FIXME: add the doc files back +%changelog +* Wed Nov 12 2008 Andrew Overholt 3.0.3-4 +- Add patch for e.o#239435 (rhbz#470356). + +* Fri Oct 31 2008 Alexander Kurtakov 3.0.3-3 +- Don't apply nojaxb.patch. +- Fix eclipse-mylyn-splitxmlrpc.patch to Import-Package:org.apache.xmlrpc. + +* Tue Oct 21 2008 Alexander Kurtakov 3.0.3-2 +- BR ws-jaxme. +- Bump xmlrpc3 requires for proper OSGi metadata. +- Fix trac feature.xml to not require different qualifier for the deps. + +* Tue Oct 21 2008 Alexander Kurtakov 3.0.3-1 +- 3.0.3. +- Rebase addfedoracustomizations.patch. + +* Sat Oct 18 2008 Alexander Kurtakov 3.0.1-3 +- Add >= for jdom to ensure proper OSGi metadata + +* Mon Aug 11 2008 Andrew Overholt 3.0.1-2 +- Add >= for requirements to ensure proper OSGi metadata + +* Fri Aug 08 2008 Andrew Overholt 3.0.1-1 +- Fix fuzz on adding Fedora customizations patch +- Add patch to make Red Hat bugzilla 3.0 + +* Thu Aug 07 2008 Andrew Overholt 3.0.1-1 +- Add webtasks sub-package + +* Tue Aug 05 2008 Andrew Overholt 3.0.1-1 +- Update install locations +- Add qualifier hack for now + +* Wed Jul 30 2008 Andrew Overholt 3.0.1-1 +- 3.0.1 +- Add patch to not require jaxb (required by XML-RPC Orbit bundle) +- Fold -ide and -bugzilla into main package +- Add commented-out webtasks sub-package; to be enabled after rome + review is complete + +* Thu Jul 17 2008 Tom "spot" Callaway 2.3.2-6 +- fix license tag + +* Wed May 14 2008 Andrew Overholt 2.3.2-6 +- ".qualifier" -> actual release qualifier in build (due to upstream + build system change (e.o#108291, rh#446468). + +* Tue Apr 15 2008 Andrew Overholt 2.3.2-5 +- Re-build to attempt to fix rhbz#442251 (broken cpio archive). + +* Tue Apr 15 2008 Jesse Keating - 2.3.2-4 +- Rebuild due to filesystem corruption + +* Mon Apr 07 2008 Andrew Overholt 2.3.2-3 +- Fix commons-lang symlink. + +* Mon Apr 07 2008 Andrew Overholt 2.3.2-2 +- Upload sources. + +* Fri Apr 04 2008 Andrew Overholt 2.3.2-1 +- 2.3.2. +- Add jakarta-commons-lang dependency. + +* Tue Feb 19 2008 Fedora Release Engineering - 2.1.0-2 +- Autorebuild for GCC 4.3 + +* Wed Oct 24 2007 Andrew Overholt 2.1.0-1 +- 2.1.0 +- Enable GNOME bugzilla by default + +* Tue Oct 02 2007 Andrew Overholt 2.0.0-10 +- Add %%post gcj blocks for sub-packages (thanks to David Walluck). +- Rename fetching script (s/mylar/mylyn/). + +* Fri Sep 21 2007 Andrew Overholt 2.0.0-9 +- Really remove all mylar references in mylyn feature - courtesy + Mandriva package. + +* Wed Sep 19 2007 Andrew Overholt 2.0.0-8 +- Add patch and source to have common bugzilla servers by default. + +* Tue Sep 18 2007 Andrew Overholt 2.0.0-7 +- Fix filename of webcore jar. + +* Tue Sep 18 2007 Andrew Overholt 2.0.0-6 +- Re-add gcj support (accidentally removed the flag). + +* Fri Sep 07 2007 Andrew Overholt 2.0.0-5 +- Make web.core its own jar. +- Unpack web.core so we can symlink to dependencies. +- Symlink to dependencies of web.core. +- Remove rome jar and exports from web.core. +- BR/R all the versions of dependencies that have OSGi manifests. + +* Fri Aug 24 2007 Andrew Overholt 2.0.0-4 +- ExcludeArch ppc64 (no xmlrpc3 on ppc64 due to rh#239123). + +* Thu Aug 23 2007 Andrew Overholt 2.0.0-3 +- Add BR on eclipse-pde. + +* Thu Aug 23 2007 Andrew Overholt 2.0.0-2 +- Add BR and R on eclipse-cvs-client. + +* Thu Aug 23 2007 Andrew Overholt 2.0.0-1 +- Re-name to eclipse-mylyn. + +* Fri Aug 10 2007 Ben Konrath 2.0.0-1 +- 2.0.0 +- Add -java and -pde sub-packages. + +* Wed Apr 25 2007 Andrew Overholt 2.0-0.1.M2a.1 +- 2.0M2a (a re-tag to fix some tagging issues). + +* Wed Apr 18 2007 Andrew Overholt 1.0-4 +- Add workaround for missing method in GNU Classpath. + +* Thu Apr 12 2007 Andrew Overholt 1.0-3 +- Add Obsoletes and Provides for eclipse-bugzilla on + eclipse-mylar-bugzilla (comments in bug #222677). If someone notices + missing functionality to warrant removing the Provides, please file a + bug. + +* Tue Mar 20 2007 Andrew Overholt 1.0-2 +- Use xmlrpc3 jars instead of xmlrpc + +* Fri Mar 16 2007 Andrew Overholt 1.0-1 +- Initial build \ No newline at end of file