From 8342665f1918fc5d762ed121675fbb6bbb838c28 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Jan 10 2007 18:58:44 +0000 Subject: - Rpmlint cleanups. --- diff --git a/eclipse.spec b/eclipse.spec index db5f13c..4a3c9e4 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,8 +1,8 @@ -Epoch: 1 +Epoch: 1 -%define gcj_support 1 -%define tomcatsharedir %{_datadir}/tomcat5 -%define tomcatlibdir %{_var}/lib/tomcat5 +%define gcj_support 1 +%define tomcatsharedir %{_datadir}/tomcat5 +%define tomcatlibdir %{_var}/lib/tomcat5 %define eclipse_major 3 %define eclipse_minor 2 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} @@ -19,8 +19,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 27%{?dist} -License: EPL +Release: 28%{?dist} +License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-sourceBuild-srcIncluded-3.2.1.zip @@ -41,52 +41,52 @@ Source19: %{name}-filenamepatterns.txt Source20: %{name}-fileinitializerapp.tar.bz2 # Build liblocalfile and libupdate JNI libs in the main SDK build.xml -Patch0: %{name}-build.patch +Patch0: %{name}-build.patch # We need this because icu4j's Eclipse bits are dependent upon Eclipse # but we don't want the icu4j RPM needing Eclipse to build -Patch1: %{name}-icu4j-build-files.patch +Patch1: %{name}-icu4j-build-files.patch # These two patches need to go upstream -Patch2: %{name}-libupdatebuild.patch -Patch3: %{name}-libupdatebuild2.patch +Patch2: %{name}-libupdatebuild.patch +Patch3: %{name}-libupdatebuild2.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 -Patch4: %{name}-swttools.patch +Patch4: %{name}-swttools.patch # This is fixed post-3.3M1 -Patch10: %{name}-helpindexbuilder.patch +Patch10: %{name}-helpindexbuilder.patch # This needs to go upstream -Patch11: %{name}-usebuiltlauncher.patch +Patch11: %{name}-usebuiltlauncher.patch # This does two things: # 1. allows the launcher to be in /usr/bin and # 2. ensures that the OSGi configuration directory # (which contains the JNI .sos) is in %{_libdir} # We should investigate whether or not this can go upstream -Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch +Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch # Don't attempt to link to Sun's javadocs # FIXME: could use sed instead -Patch13: %{name}-javadoclinks.patch +Patch13: %{name}-javadoclinks.patch # Always generate debug info when building RPMs (Andrew Haley) # This needs to be investigated for getEnv changes -Patch14: %{name}-ecj-rpmdebuginfo.patch +Patch14: %{name}-ecj-rpmdebuginfo.patch # generic releng plugins that can be used to build plugins # see this thread for details: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html # This needs to be submitted upstream -Patch15: %{name}-pde.build-add-package-build.patch +Patch15: %{name}-pde.build-add-package-build.patch # We need to disable junit4 and apt until GCJ can handle Java5 code -Patch16: %{name}-disable-junit4-apt.patch +Patch16: %{name}-disable-junit4-apt.patch # This tomcat stuff will change when they move to the equinox jetty provider # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 -Patch6: %{name}-tomcat55.patch -Patch7: %{name}-tomcat55-build.patch -Patch8: %{name}-webapp-tomcat55.patch +Patch6: %{name}-tomcat55.patch +Patch7: %{name}-tomcat55-build.patch +Patch8: %{name}-webapp-tomcat55.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 -Patch5: %{name}-updatehomedir.patch +Patch5: %{name}-updatehomedir.patch # JPackage []s in names of symlinks ... # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177 -Patch9: %{name}-ecj-square-bracket-classpath.patch +Patch9: %{name}-ecj-square-bracket-classpath.patch # Use ecj for gcj # The patch to Main.java can go away with 3.2.2. -Patch17: %{name}-ecj-gcj.patch +Patch17: %{name}-ecj-gcj.patch # Build against firefox: # - fix swt profile include path # - don't compile the mozilla 1.7 / firefox profile library -- build it inline @@ -97,21 +97,21 @@ Patch17: %{name}-ecj-gcj.patch # it due to spaces in the paths: # sed --in-place "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g" eclipse-swt-firefox.patch # sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch -Patch18: %{name}-swt-firefox.patch -Patch19: %{name}-swt-firefox.2.patch +Patch18: %{name}-swt-firefox.patch +Patch19: %{name}-swt-firefox.2.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209393 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853 -Patch20: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch +Patch20: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch # This is already upstream in 3.3 builds. It *may* get into 3.2.2. Patch21: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch # Add ppc64 to the list of arches with gre64.conf # part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016 -Patch22: %{name}-ppc64gre64.patch +Patch22: %{name}-ppc64gre64.patch # This patch allowed us to remove # /usr/share/eclipse/configuration/org.eclipse.update/platform.xml -- which # fixed a number of update-related bugs -- in an FC6 update. # We can remove this patch for Fedora 8. -Patch23: %{name}-launcher-addplatformtotildeeclipse.patch +Patch23: %{name}-launcher-addplatformtotildeeclipse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -133,11 +133,11 @@ BuildRequires: java-javadoc BuildRequires: dos2unix BuildRequires: desktop-file-utils %if %{gcj_support} -BuildRequires: gcc-java >= 4.0.2 -BuildRequires: java-gcj-compat-devel >= 1.0.64 -BuildRequires: gjdoc >= 0.7.7-14 +BuildRequires: gcc-java >= 4.0.2 +BuildRequires: java-gcj-compat-devel >= 1.0.64 +BuildRequires: gjdoc >= 0.7.7-14 %else -BuildRequires: java-devel >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 %endif # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in @@ -156,7 +156,8 @@ BuildRequires: lucene-devel BuildRequires: regexp BuildRequires: junit >= 3.8.1-3jpp %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description @@ -168,13 +169,14 @@ JavaBeans(tm). %package ecj Summary: Eclipse Compiler for Java Group: Development/Languages -Obsoletes: ecj -Provides: ecj +Obsoletes: ecj <= 2.1.3 +Provides: ecj <= 2.1.3 %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires: libgcj >= 4.0.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %else -Requires: java >= 1.4.2 +Requires: java >= 1.4.2 %endif %description ecj @@ -184,12 +186,13 @@ Eclipse compiler for Java. Summary: SWT Library for GTK+-2.0 Group: Text Editors/Integrated Development Environments (IDE) %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires: libgcj >= 4.0.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif Requires: gtk2 Requires: firefox -Conflicts: mozilla +Conflicts: mozilla %description -n %{libname}-gtk2 SWT Library for GTK+-2.0. @@ -199,13 +202,15 @@ Summary: Eclipse Rich Client Platform Group: Development/Languages Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release} # This file-level requirement is for the bi-arch multilib case -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar -Requires(post,postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} +Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar +Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release} +Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires: libgcj >= 4.0.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %else -Requires: java >= 1.4.2 +Requires: java >= 1.4.2 %endif %description rcp @@ -215,7 +220,8 @@ Eclipse Rich Client Platform Summary: Eclipse Rich Client Platform SDK Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-rcp = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} %description rcp-sdk Source for Eclipse Rich Client Platform for use within Eclipse. @@ -224,12 +230,14 @@ Source for Eclipse Rich Client Platform for use within Eclipse. Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif Requires: %{name}-rcp = %{epoch}:%{version}-%{release} # This file-level requirement is for the bi-arch multilib case -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar -Requires(post,postun): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar +Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in # Fedora. When that's done, add it here and symlink below. # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 @@ -253,8 +261,10 @@ Summary: Eclipse Platform SDK Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(post): %{name}-rcp-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release} %description platform-sdk Source and docs for Eclipse Platform for use within Eclipse. @@ -264,12 +274,15 @@ Summary: Eclipse Java Development Tools Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-ecj = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(post): %{name}-ecj = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release} Requires: junit >= 3.8.1-3jpp Requires: java-javadoc %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description jdt @@ -281,8 +294,10 @@ Summary: Eclipse Java Development Tools SDK Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-jdt = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} %description jdt-sdk Source and docs for Eclipse Java Development Tools for use within Eclipse. @@ -293,11 +308,15 @@ Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release} Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-jdt = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description pde @@ -308,9 +327,11 @@ developing Eclipse plugins. Summary: Eclipse Plugin Development Environment runtime plugin. Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description pde-runtime @@ -321,7 +342,8 @@ Summary: Eclipse Plugin Development Environment SDK Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-pde = %{epoch}:%{version}-%{release} Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-pde = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-pde = %{epoch}:%{version}-%{release} %description pde-sdk Source and docs for Eclipse Plugin Development Environment for use within @@ -333,13 +355,18 @@ Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release} Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-pde-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} # This file requirement is to deal with the biarch installation case -Requires(post,postun): %{_libdir}/%{name}/configuration/config.ini +Requires(post): %{_libdir}/%{name}/configuration/config.ini +Requires(postun): %{_libdir}/%{name}/configuration/config.ini %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description sdk @@ -412,10 +439,10 @@ popd # Link against our system-installed javadocs %patch13 -p0 sed --in-place "s:/usr/share/:%{_datadir}/:g" \ - plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ - plugins/org.eclipse.pde.doc.user/pdeOptions \ - plugins/org.eclipse.platform.doc.isv/platformOptions.txt + plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt \ + plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ + plugins/org.eclipse.pde.doc.user/pdeOptions \ + plugins/org.eclipse.platform.doc.isv/platformOptions.txt %patch14 -p0 pwd @@ -642,8 +669,8 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \ - assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ - features/org.eclipse.rcp/build.xml + assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ + features/org.eclipse.rcp/build.xml # Nasty hack to get suppport for ppc64, s390{,x} and sparc{,64} # Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace @@ -663,7 +690,7 @@ sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gt # remove ppc64 support from features/org.eclipse.platform.source/feature.xml mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig - grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml + grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml # finally, the replacement hack for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do @@ -1224,11 +1251,11 @@ for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -t # unpack every zip, set the date of the files and directories and repack the zip ZIPNAME=`basename $zip` TMPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.tmpdir.XXXXXXXXXX` - ZIPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.zipdir.XXXXXXXXXX` + ZIPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.zipdir.XXXXXXXXXX` pushd $TMPDIR unzip -qq -o $zip - rm -f $zip + rm -f $zip # check if there are jars or zips inside the zip or jar zipsinside=`find $TMPDIR -type f -name \*.zip -o -name \*.jar` @@ -1711,6 +1738,9 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Wed Jan 10 2007 Ben Konrath 3.2.1-28 +- Rpmlint cleanups. + * Fri Jan 05 2007 Ben Konrath 3.2.1-27 - Use /g in tomcat version replacement. - Disable com.jcraft.jsch_0.1.28.jar and @@ -1872,11 +1902,11 @@ fi - Use new swt-firefox patch and consolidate others into one. * Wed Sep 27 2006 Ben Konrath 3.2.1-0.RC.3 -- Fix typo in %postun of -sdk and -platform. +- Fix typo in %%postun of -sdk and -platform. - Disable help index generation on ia64. * Tue Sep 26 2006 Ben Konrath 3.2.1-0.RC.2 -- Don't set eclipse.product incorrectly in %postun of -sdk and -platform. +- Don't set eclipse.product incorrectly in %%postun of -sdk and -platform. * Mon Sep 25 2006 Ben Konrath 3.2.1-0.RC.1 - M20060921-0945 (3.2.1 pre-release). @@ -1916,7 +1946,7 @@ fi - Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because it has not been applied upstream. - Minor spec file clean ups. -- Add %{name} to the -devel package Provides so that upgrading from +- Add %%{name} to the -devel package Provides so that upgrading from FC-5 to FC-6 works. - Re-enable natively compiling the ant.ui plugin. - Re-enable natively compiling the team.cvs.core plugin on ia64.