rpms/eclipse-photran/devel eclipse-photran.spec,1.3,1.4

[Orion Poplawski]

Author: orion

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

Modified Files:
	eclipse-photran.spec 
Log Message:
* Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.2
- Split out IBM XL Fortran support into sub-package



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-photran.spec	28 Aug 2008 20:22:05 -0000	1.3
+++ eclipse-photran.spec	3 Sep 2008 15:46:18 -0000	1.4
@@ -8,7 +8,7 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.b4%{?dist}.1
+Release:        0.b4%{?dist}.2
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
@@ -32,11 +32,7 @@
 Requires:       eclipse-platform >= 1:3.3.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
-%if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-%else
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-%endif
+#ExclusiveArch: %{ix86} x86_64 ppc ia64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 
@@ -45,6 +41,15 @@
 that are useful for Fortran development.
 
 
+%package        xlf
+Summary:        IBM XL Fortran compiler support for Photran
+Group:          Development/Libraries
+Requires:       libvirt = %{version}
+
+%description    xlf
+%{summary}.
+
+
 %prep
 %setup -q -n org.eclipse.photran-v20080808_4_0_0_Beta4
 # Fixup to use 1.5 source level
@@ -54,7 +59,7 @@
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
-for feature in org.eclipse.photran_feature org.eclipse.photran.vpg_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 cdt \
@@ -71,6 +76,9 @@
   
   unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \
               build/rpmBuild/org.eclipse.${feature}_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
 done
 
 %if %{gcj_support}
@@ -90,15 +98,23 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/dropins/*
+%{eclipse_base}/dropins/photran
+%{eclipse_base}/dropins/photran.vpg
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
+%files xlf
+%defattr(-,root,root,-)
+%{eclipse_base}/dropins/photran.xlf
+
 
 %changelog
+* Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.2
+- Split out IBM XL Fortran support into sub-package
+
 * Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.1
 - 4.0.0 Beta 4
 - Update for building against Eclipse SDK 3.4