packages: eclipse/eclipse.spec - package source packages to manifests verif...

glen glen at pld-linux.org
Sun Nov 14 18:19:52 CET 2010 

Author: glen                         Date: Sun Nov 14 17:19:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package source packages to manifests verified
- use javadeps generation

---- Files affected:
packages/eclipse:
   eclipse.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/eclipse/eclipse.spec
diff -u packages/eclipse/eclipse.spec:1.100 packages/eclipse/eclipse.spec:1.101
--- packages/eclipse/eclipse.spec:1.100	Wed May 12 13:27:21 2010
+++ packages/eclipse/eclipse.spec	Sun Nov 14 18:19:46 2010
@@ -3,15 +3,15 @@
 # - make use of eclipse-swt package
 
 %define		ver_major	3.3.1.1
-%define		buildid	200710231652
+%include	/usr/lib/rpm/macros.java
 Summary:	Eclipse - an open extensible IDE
 Summary(pl.UTF-8):	Eclipse - otwarte, rozszerzalne środowisko programistyczne
 Name:		eclipse
 Version:	%{ver_major}
-Release:	3
+Release:	4
 License:	EPL v1.0
 Group:		Development/Tools
-Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-%{buildid}/%{name}-sourceBuild-srcIncluded-%{version}.zip
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-200710231652/%{name}-sourceBuild-srcIncluded-%{version}.zip
 # Source0-md5:	593b56fce7d1f1f799e87365cafefbef
 Source1:	%{name}.desktop
 Patch0:		%{name}-launcher-set-install-dir-and-shared-config.patch
@@ -20,14 +20,15 @@
 BuildRequires:	ant >= 1.6.1
 BuildRequires:	ant-apache-regexp
 BuildRequires:	jdk >= 1.6
+BuildRequires:	jpackage-utils
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 BuildRequires:	zip
 Requires:	ant
-Requires:	jdk >= 1.4
 Obsoletes:	eclipse-SDK
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -102,8 +103,8 @@
 if [ ! -f installed.stamp ]; then
 	install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-	install plugins/org.eclipse.core.filesystem/natives/unix/linux/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
-	install plugins/org.eclipse.update.core.linux/src/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+	install -p plugins/org.eclipse.core.filesystem/natives/unix/linux/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+	install -p plugins/org.eclipse.update.core.linux/src/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 	# wrapper
 	install -d $RPM_BUILD_ROOT%{_bindir}
@@ -117,12 +118,15 @@
 	version=%{version}
 	EOF
 
-	if [ ! -f "$RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm" ]; then
-		install features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm
+	if [ ! -f $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm ]; then
+		install -p features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm
 	fi
-	install -D features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm
+	install -Dp features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm
 
 	# not packaged -- remove
+	%if 0
+	# if we're removing source bundles, we should adjust manifests as well, but
+	# were not doing that, so don't break packaging
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.cvs.source_*
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.jdt.source_*
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.pde.source_*
@@ -145,6 +149,7 @@
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_*
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.junit.source_*
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_*
+	%endif
 
 	touch installed.stamp
 fi
@@ -306,6 +311,31 @@
 %{_libdir}/%{name}/plugins/org.junit4_*.*.*
 %{_libdir}/%{name}/plugins/org.mortbay.jetty_*.*.*
 
+%if 1
+%{_libdir}/%{name}/features/org.eclipse.cvs.source_*
+%{_libdir}/%{name}/features/org.eclipse.jdt.source_*
+%{_libdir}/%{name}/features/org.eclipse.pde.source_*
+%{_libdir}/%{name}/features/org.eclipse.platform.source_*
+%{_libdir}/%{name}/features/org.eclipse.rcp.source_*
+%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_*
+%{_libdir}/%{name}/plugins/javax.servlet.source_*
+%{_libdir}/%{name}/plugins/org.apache.ant.source_*
+%{_libdir}/%{name}/plugins/org.apache.commons.el.source_*
+%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_*
+%{_libdir}/%{name}/plugins/org.apache.jasper.source_*
+%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_*
+%{_libdir}/%{name}/plugins/org.apache.lucene.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.cvs.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_*
+%{_libdir}/%{name}/plugins/org.junit.source_*
+%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_*
+%endif
+
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/features
 %dir %{_datadir}/%{name}/plugins
@@ -317,6 +347,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2010/11/14 17:19:46  glen
+- package source packages to manifests verified
+- use javadeps generation
+
 Revision 1.100  2010/05/12 11:27:21  baggins
 - rel 3
 - fixed desktop categories
@@ -328,7 +362,7 @@
 - cleanup outdated todo
 
 Revision 1.97  2009/04/14 11:40:33  glen
-- add con tents to .eclipseextension
+- add contents to .eclipseextension
 
 Revision 1.96  2008/12/26 02:14:50  adamg
 - previous commit reverted (mistake)
@@ -410,7 +444,7 @@
 - there's nothing "further" after exec
 
 Revision 1.73  2006/07/19 23:06:45  czarny
- - changed wrapper shell to bash because of expr error in further eclipse scripts
+- changed wrapper shell to bash because of expr error in further eclipse scripts
 
 Revision 1.72  2006/07/17 19:56:49  glen
 - drop noarch from ExclusiveArch (no BuildArch: noarch present)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eclipse/eclipse.spec?r1=1.100&r2=1.101&f=u

More information about the pld-cvs-commit mailing list