rpms/eclipse-photran/devel .cvsignore, 1.3, 1.4 eclipse-photran.spec, 1.6, 1.7 makesource.sh, 1.1, 1.2 sources, 1.3, 1.4

Tue Feb 24 00:01:29 UTC 2009

Author: orion

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

Modified Files:
	.cvsignore eclipse-photran.spec makesource.sh sources 
Log Message:
* Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.4.b5
- Update to 4.0.0 Beta 5
- Fix release tag
- Add Intel compiler support package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	28 Aug 2008 20:22:05 -0000	1.3
+++ .cvsignore	24 Feb 2009 00:00:59 -0000	1.4
@@ -1 +1 @@
-org.eclipse.photran-v20080808_4_0_0_Beta4.tar.gz
+org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz


Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-photran.spec	5 Sep 2008 14:37:06 -0000	1.6
+++ eclipse-photran.spec	24 Feb 2009 00:00:59 -0000	1.7
@@ -8,14 +8,14 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.b4%{?dist}.3
+Release:        0.4.b5%{?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-v20080808_4_0_0_Beta4.tar.gz
+Source0: org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
 Source1: makesource.sh
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-cdt >= 4.0.1
@@ -41,6 +41,15 @@
 that are useful for Fortran development.
 
 
+%package        intel
+Summary:        Intel Fortran compiler support for Photran
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    intel
+%{summary}.
+
+
 %package        xlf
 Summary:        IBM XL Fortran compiler support for Photran
 Group:          Development/Libraries
@@ -51,31 +60,32 @@
 
 
 %prep
-%setup -q -n org.eclipse.photran-v20080808_4_0_0_Beta4
+%setup -q -n org.eclipse.photran-v20090220_4_0_0_Beta5
 # 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
+sed -i -e 's/os="linux"//' org.eclipse.photran.intel-feature/feature.xml
 
 
 %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_feature org.eclipse.photran.intel \
+               org.eclipse.photran.vpg_feature org.eclipse.photran.xlf_feature
 do
-  %{eclipse_base}/buildscripts/pdebuild -D -d cdt \
-    -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+  %{eclipse_base}/buildscripts/pdebuild -d cdt \
+    -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 photran.vpg photran.xlf
+for feature in photran_feature photran.vpg_feature photran.intel photran.xlf_feature
 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}_feature.zip
+              build/rpmBuild/org.eclipse.${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
@@ -100,18 +110,27 @@
 %files
 %defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/dropins/photran
-%{eclipse_base}/dropins/photran.vpg
+%{eclipse_base}/dropins/photran_feature
+%{eclipse_base}/dropins/photran.vpg_feature
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
+%files intel
+%defattr(-,root,root,-)
+%{eclipse_base}/dropins/photran.intel
+
 %files xlf
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.xlf
+%{eclipse_base}/dropins/photran.xlf_feature
 
 
 %changelog
+* Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.4.b5
+- Update to 4.0.0 Beta 5
+- Fix release tag
+- Add Intel compiler support package
+
 * Fri Sep 5 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.3
 - Fix xlf Requires
 


Index: makesource.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/makesource.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makesource.sh	28 Aug 2008 20:22:06 -0000	1.1
+++ makesource.sh	24 Feb 2009 00:00:59 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-rel=v20080808_4_0_0_Beta4
+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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Aug 2008 20:22:06 -0000	1.3
+++ sources	24 Feb 2009 00:00:59 -0000	1.4
@@ -1 +1 @@
-55701c38f6bd399b76fd574d3b50b75e  org.eclipse.photran-v20080808_4_0_0_Beta4.tar.gz
+deb885704962b8d5815c27595e47d526  org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz


