[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse/devel eclipse.spec,1.150,1.151



Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26670

Modified Files:
	eclipse.spec 
Log Message:
Further munging of bundle directories in swt and platform files section.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- eclipse.spec	22 Jun 2005 20:22:25 -0000	1.150
+++ eclipse.spec	23 Jun 2005 15:21:45 -0000	1.151
@@ -690,7 +690,8 @@
     pushd `dirname $l`;
       ln -sf %{_libdir}/%{name}/`basename $l`;
     popd;
-    # Make note of the SWT bundle number for later
+    # SWT bundle stuff should go in libswt3-gtk
+    # Contents of other bundles should go in eclipse-platform
     if [ "`basename $l`" = "libswt-gtk-%{swt_version}.so" ]
     then
         pushd `dirname $l`;
@@ -699,6 +700,16 @@
           # Add this directory to the files list for libswt
           echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
         popd
+    elif [ "`basename $l`" = "libswt-atk-gtk-%{swt_version}.so" ]; then
+        echo `basename $l`;
+    elif [ "`basename $l`" = "libswt-awk-gtk-%{swt_version}.so" ]; then
+        echo `basename $l`;
+    elif [ "`basename $l`" = "libswt-gnome-gtk-%{swt_version}.so" ]; then
+        echo `basename $l`;
+    elif [ "`basename $l`" = "libswt-mozilla-gtk-%{swt_version}.so" ]; then
+        echo `basename $l`;
+    elif [ "`basename $l`" = "libswt-pi-gtk-%{swt_version}.so" ]; then
+        echo `basename $l`;
     else
         pushd `dirname $l`;
 	  cd ../..;
@@ -1019,9 +1030,6 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 %dir %{_datadir}/%{name}/features
-%dir %{_datadir}/%{name}/configuration
-%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
-%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
 %{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar
 %{_datadir}/java/eclipse-ecj.jar
@@ -1116,11 +1124,15 @@
 %{_libdir}/%{name}/eclipse
 %{_libdir}/%{name}/libcore*
 %{_libdir}/%{name}/libupdate*
+# This is all from our FileInitializer extraction of .sos
+# all extracted bundles other than SWT will be in eclipse-platform.install
 %dir %{_datadir}/%{name}/configuration
 %dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
 %dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
-%{_datadir}/%{name}/configuration/org.eclipse.osgi/.*
-# all extracted bundles other than SWT will be in eclipse-platform.install
+%{_datadir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
+%{_datadir}/%{name}/configuration/org.eclipse.osgi/.lazy*
+%{_datadir}/%{name}/configuration/org.eclipse.osgi/.manager
+%{_datadir}/%{name}/configuration/org.eclipse.osgi/.state*
 %{_datadir}/%{name}/configuration/config.ini
 %{_datadir}/%{name}/configuration/org.eclipse.core.runtime
 %{_datadir}/%{name}/configuration/org.eclipse.update


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]