rpms/eclipse-mylyn/devel eclipse-mylyn.spec, 1.23, 1.24 fetch-mylyn.sh, 1.6, 1.7

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16121

Modified Files:
	eclipse-mylyn.spec fetch-mylyn.sh 
Log Message:
* Thu Aug 07 2008 Andrew Overholt <overholt at redhat.com> 3.0.1-1
- Add webtasks sub-package


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- eclipse-mylyn.spec	5 Aug 2008 22:22:06 -0000	1.23
+++ eclipse-mylyn.spec	7 Aug 2008 19:00:08 -0000	1.24
@@ -41,8 +41,8 @@
 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: rome
+BuildRequires: jdom
 Requires: eclipse-platform >= 1:3.4.0
 Requires: eclipse-cvs-client >= 1:3.4.0
 Requires: jakarta-commons-codec >= 1.3-8jpp.2
@@ -101,16 +101,16 @@
 %description pde
 Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS.
 
-#%package  webtasks
-#Summary:  Mylyn Focused UI
-#Requires: %{name} = %{version}-%{release}
-#Requires: rome
-#Requires: jdom
-#Group: Development/Tools
-#
-#%description webtasks
-#Provides Task List integration for several web-based issue trackers
-#and templates for example projects.
+%package  webtasks
+Summary:  Mylyn Focused UI
+Requires: %{name} = %{version}-%{release}
+Requires: rome
+Requires: jdom
+Group: Development/Tools
+
+%description webtasks
+Provides Task List integration for several web-based issue trackers
+and templates for example projects.
 
 %prep
 %setup -q -n org.eclipse.mylyn
@@ -129,8 +129,8 @@
 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}/jdom-1.0.jar org.jdom_1.0.0.v200806100616.jar
-#ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar
+ln -s %{_javadir}/jdom-1.0.jar org.jdom_1.0.0.v200806100616.jar
+ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar
 popd
 
 #javax.activation_1.1.0.v200806101325.jar
@@ -188,10 +188,10 @@
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
  -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
  -o `pwd`/orbitDeps
-#%{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/jre/lib/rt.jar \
-# -o `pwd`/orbitDeps
+%{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/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
 
 %install
 rm -rf %{buildroot}
@@ -200,7 +200,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-java
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-pde
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-trac
-#install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks
 
 unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \
  build/rpmBuild/org.eclipse.mylyn_feature.zip
@@ -218,8 +218,8 @@
  build/rpmBuild/org.eclipse.mylyn.java_feature.zip
 unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-pde \
  build/rpmBuild/org.eclipse.mylyn.pde_feature.zip
-#unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks \
-# build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip
+unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks \
+ build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins
 rm org.apache.commons.codec_1.3.0.v20080530-1600.jar
@@ -241,11 +241,18 @@
 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-webtasks/eclipse/plugins
+rm org.jdom_1.0.0.v200806100616.jar
+rm com.sun.syndication_0.9.0.v200803061811.jar
+ln -s %{_javadir}/jdom-1.0.jar org.jdom_1.0.0.v200806100616.jar
+ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar
+popd
+
 %clean
 rm -rf %{buildroot}
 
-#%files webtasks
-#%defattr(-,root,root,-)
+%files webtasks
+%defattr(-,root,root,-)
 #%{install_loc}/plugins/com.sun.syndication_*.jar
 #%{install_loc}/plugins/org.jdom_*.jar
 #%{install_loc}/plugins/org.eclipse.mylyn.web.tasks_*.jar
@@ -254,7 +261,7 @@
 #%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/about.html
 #%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/epl-v10.html
 #%{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/feature.xml
-#%{install_loc}/mylyn-webtasks
+%{install_loc}/mylyn-webtasks
 
 %files trac
 %defattr(-,root,root,-)
@@ -286,6 +293,9 @@
 # FIXME:  add the doc files back
 
 %changelog
+* Thu Aug 07 2008 Andrew Overholt <overholt at redhat.com> 3.0.1-1
+- Add webtasks sub-package
+
 * Tue Aug 05 2008 Andrew Overholt <overholt at redhat.com> 3.0.1-1
 - Update install locations
 - Add qualifier hack for now


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fetch-mylyn.sh	1 Aug 2008 18:02:08 -0000	1.6
+++ fetch-mylyn.sh	7 Aug 2008 19:00:08 -0000	1.7
@@ -47,6 +47,9 @@
 org.eclipse.mylyn.trac-feature \
 org.eclipse.mylyn.trac.tests \
 org.eclipse.mylyn.trac.ui \
+org.eclipse.mylyn.web.tasks-feature \
+org.eclipse.mylyn.web.ui \
+org.eclipse.mylyn.web.tasks \
 ; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
 export -r R_3_0_1 org.eclipse.mylyn/$f;