rpms/eclipse-photran/devel .cvsignore, 1.4, 1.5 eclipse-photran.spec, 1.10, 1.11 makesource.sh, 1.2, 1.3 sources, 1.4, 1.5 eclipse-photran-4.0.0b5-outline.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13280

Modified Files:
	.cvsignore eclipse-photran.spec makesource.sh sources 
Removed Files:
	eclipse-photran-4.0.0b5-outline.patch 
Log Message:
* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
- Update to 5.0.0 pre-release 200910081739
- Drop outline patch fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Feb 2009 00:00:59 -0000	1.4
+++ .cvsignore	14 Oct 2009 16:04:41 -0000	1.5
@@ -1 +1 @@
-org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+photran-v200910081739.tar.gz


Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-photran.spec	24 Jul 2009 20:56:03 -0000	1.10
+++ eclipse-photran.spec	14 Oct 2009 16:04:41 -0000	1.11
@@ -1,5 +1,5 @@
 %define gcj_support             1
-%define major                   4
+%define major                   5
 %define minor                   0       
 %define patch                   0       
 %define majmin                  %{major}.%{minor}
@@ -8,18 +8,18 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.7.b5%{?dist}
+Release:        0.1.200910081739%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
 Requires:       eclipse-platform
 
 # The following tarball was generated by the makesource.sh script
-Source0: org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+Source0: photran-v200910081739.tar.gz
 Source1: makesource.sh
-Patch0:  eclipse-photran-4.0.0b5-outline.patch
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-cdt >= 4.0.1
+BuildRequires: eclipse-pde >= 1:3.5
+BuildRequires: eclipse-cdt >= 1:6.0
+BuildRequires: eclipse-rse >= 3.1
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
@@ -30,7 +30,7 @@ BuildRequires:  java-devel >= 1.4.2
 %endif
 
 Requires:       gdb make gcc-gfortran
-Requires:       eclipse-platform >= 1:3.3.0
+Requires:       eclipse-platform >= 1:3.5.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -61,8 +61,7 @@ Requires:       %{name} = %{version}-%{r
 
 
 %prep
-%setup -q -n org.eclipse.photran-v20090220_4_0_0_Beta5
-%patch0 -p1 -b .outline
+%setup -q -n photran-v200910081739
 # Fixup to use 1.5 source level
 find -name \*.prefs | xargs sed -i -e 's/source=1.3/source=1.5/'
 # This prevents the intel feature from building
@@ -72,22 +71,21 @@ sed -i -e 's/os="linux"//' org.eclipse.p
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
-for feature in org.eclipse.photran_feature org.eclipse.photran.intel \
-               org.eclipse.photran.vpg_feature org.eclipse.photran.xlf_feature
+for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf
 do
-  %{eclipse_base}/buildscripts/pdebuild -d cdt \
+  %{eclipse_base}/buildscripts/pdebuild -d "cdt rse" \
     -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" 2>&1 | tee ${feature}.log
 done
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-for feature in photran_feature photran.vpg_feature photran.intel photran.xlf_feature
+for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf
 do
   install -d -m755 ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
   
   unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \
-              build/rpmBuild/org.eclipse.${feature}.zip
+              build/rpmBuild/${feature}.zip
   mv ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse/* \
      ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
   rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse
@@ -112,22 +110,25 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/dropins/photran_feature
-%{eclipse_base}/dropins/photran.vpg_feature
+%{eclipse_base}/dropins/org.eclipse.photran
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %files intel
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.intel
+%{eclipse_base}/dropins/org.eclipse.photran.intel
 
 %files xlf
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.xlf_feature
+%{eclipse_base}/dropins/org.eclipse.photran.xlf
 
 
 %changelog
+* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
+- Update to 5.0.0 pre-release 200910081739
+- Drop outline patch fixed upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.b5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: makesource.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/makesource.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- makesource.sh	24 Feb 2009 00:00:59 -0000	1.2
+++ makesource.sh	14 Oct 2009 16:04:41 -0000	1.3
@@ -1,15 +1,6 @@
 #!/bin/sh
 
-rel=v20090220_4_0_0_Beta5
-rm -rf org.eclipse.photran-$rel
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $rel -d org.eclipse.photran-$rel org.eclipse.photran
-
-#Cleanup deprecated stuff
-pushd org.eclipse.photran-$rel
-for deprecated in */THIS_*_DEPRECATED
-do
-  rm -rf `dirname $deprecated`
-done
-popd
-
-tar czf org.eclipse.photran-$rel.tar.gz org.eclipse.photran-$rel
+rel=v200910081739
+rm -rf photran-$rel
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools -z3 export -r $rel -d photran-$rel org.eclipse.ptp/photran
+tar czf photran-$rel.tar.gz photran-$rel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Feb 2009 00:00:59 -0000	1.4
+++ sources	14 Oct 2009 16:04:41 -0000	1.5
@@ -1 +1 @@
-deb885704962b8d5815c27595e47d526  org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+7dd0e71953daaaa6fddccb68d15f2504  photran-v200910081739.tar.gz


--- eclipse-photran-4.0.0b5-outline.patch DELETED ---