rpms/eclipse-changelog/devel .cvsignore, 1.9, 1.10 eclipse-changelog.spec, 1.49, 1.50 sources, 1.16, 1.17 eclipse-changelog-build.properties.patch, 1.1, NONE eclipse-changelog-customTargets.xml.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 18 18:47:32 UTC 2006
Author: klee
Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4965
Modified Files:
.cvsignore eclipse-changelog.spec sources
Removed Files:
eclipse-changelog-build.properties.patch
eclipse-changelog-customTargets.xml.patch
Log Message:
* Mon Sep 18 2006 Kyu Lee <klee at redhat.com> 2.3.1-1
-Move from releng style build to 'package build' builds.
-Import 2.3.1 - has improved error handling.
-Enable support for all arches.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 14 Sep 2006 19:39:33 -0000 1.9
+++ .cvsignore 18 Sep 2006 18:47:30 -0000 1.10
@@ -1 +1 @@
-eclipse-changelog-fetched-2.3.0.tar.gz
+eclipse-changelog-src-2.3.1.zip
Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- eclipse-changelog.spec 14 Sep 2006 19:39:33 -0000 1.49
+++ eclipse-changelog.spec 18 Sep 2006 18:47:30 -0000 1.50
@@ -1,116 +1,89 @@
-Epoch: 1
+%define fedora 1
+%define redhat 0
+%if %{fedora}
+%define gcj_support 1
+%else
+%define gcj_support 0
+%endif
+
+%define eclipse_name eclipse
+%define eclipse_base %{_datadir}/%{eclipse_name}
+
+Name: eclipse-changelog
+Version: 2.3.1
+Release: 1%{?dist}
+Summary: Eclipse ChangeLog plug-in
-%define gcj_support 1
-%define changelog_major 2
-%define changelog_minor 3
-%define changelog_majmin %{changelog_major}.%{changelog_minor}
-%define changelog_micro 0
-%define eclipse_base %{_datadir}/eclipse
-%define eclipse_lib_base %{_libdir}/eclipse
-
-Summary: Eclipse ChangeLog plug-in
-Name: eclipse-changelog
-Version: %{changelog_majmin}.%{changelog_micro}
-Release: 1%{?dist}
-License: EPL
-Group: Text Editors/Integrated Development Environments (IDE)
-URL: http://sources.redhat.com/eclipse
-Requires: eclipse-platform >= 1:3.2.0
-Requires: eclipse-platform < 1:3.2.1
-
-# Note that following the Eclipse Releng process we do not distribute a real
-# .tar.gz file. Instead, you must build it by hand. The way to do this is to
-# check out com.redhat.eclipse.changelog.releng. Edit maps/changelog.map to
-# refer to the tag appropriate to the release. Then run the "fetch" target to
-# fetch everything. Package this up, such that the tar file unpacks a new
-# "com.redhat.eclipse.changelog.releng" directory with all the contents. See
-# the java command to see how to invoke things in the releng build.xml.
-
-Source0: %{name}-fetched-%{changelog_majmin}.%{changelog_micro}.tar.gz
-Patch0: %{name}-build.properties.patch
-Patch1: %{name}-customTargets.xml.patch
-Patch2: %{name}-removePydev.patch
+Group: Text Editors/Integrated Development Environments (IDE)
+License: CPL
+URL: http://sources.redhat.com/eclipse
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-cdt
+Source0: %{name}-src-%{version}.zip
+Patch0: %{name}-removePydev.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: eclipse-pde >= 1:3.2.0
+BuildRequires: eclipse-cdt
%if %{gcj_support}
-BuildRequires: gcc-java >= 4.0.0-1
-BuildRequires: java-gcj-compat-devel >= 1.0.64
-Requires(post): java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
+BuildRequires: gcc-java >= 4.0.2
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%else
-BuildRequires: java-devel >= 1.4.2
+BuildRequires: java-devel >= 1.4.2
%endif
%if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc
%else
-BuildArch: noarch
+BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-buildroot
+
+Requires: eclipse-platform >= 1:3.2.0
%description
The Eclipse ChangeLog package contains Eclipse features and plugins that are
useful for ChangeLog maintenance within the Eclipse IDE.
%prep
-%setup -q -c
-pushd com.redhat.eclipse.changelog.releng
-%patch0
-%patch1
-popd
-pushd com.redhat.eclipse.changelog.releng/results/plugins/com.redhat.eclipse.changelog.core
-%patch2
-popd
+%setup -q -c -n eclipse-changelog-%{version}
-%build
+pushd com.redhat.eclipse.changelog.core
+%patch0 -p0
+popd
+%build
# See comments in the script to understand this.
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} cdt
+SDK=$(cd SDK > /dev/null && pwd)
-SDK=$(cd SDK && pwd)
-
+# Eclipse may try to write to the home directory.
mkdir home
-
homedir=$(cd home > /dev/null && pwd)
-pushd `pwd`
-cd com.redhat.eclipse.changelog.releng
-
-# Call eclipse headless to process changelog releng build scripts
-# need -Dosgi.install.area for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20198
-java -cp $SDK/startup.jar \
- -Duser.home=$homedir \
- -Dosgi.install.area=%{eclipse_base} \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -DjavacFailOnError=false \
- -DdontUnzip=true \
- -DbaseLocation=$SDK \
- -Dpde.build.scripts=%{eclipse_base}/plugins/org.eclipse.pde.build/scripts \
- -DdontFetchAnything=true
-popd
+# build the main phpeclips feature
+java -cp %{eclipse_base}/startup.jar \
+ -Duser.home=$homedir \
+ org.eclipse.core.launcher.Main \
+ -application org.eclipse.ant.core.antRunner \
+ -Dtype=feature \
+ -Did=com.redhat.eclipse.changelog \
+ -DsourceDirectory=$(pwd) \
+ -DbaseLocation=$SDK \
+ -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
+ -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
%install
-rm -rf ${RPM_BUILD_ROOT}
-
-install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
+rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/com.redhat.eclipse.changelog.zip
-# Dump the files from the releng tarball into the build root
-for file in $(pwd)/com.redhat.eclipse.changelog.releng/results/I.*/*.tar.gz; do
- case $file in
- *eclipse-Changelog*)
- # The ".." is needed since the zip files contain "eclipse/foo".
- (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxf $file)
- ;;
- esac
-done
%if %{gcj_support}
-aot-compile-rpm
+ aot-compile-rpm
%endif
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%clean
+rm -rf $RPM_BUILD_ROOT
%if %{gcj_support}
%post -p %{_bindir}/rebuild-gcj-db
@@ -122,13 +95,18 @@
%{eclipse_base}/features/com.redhat.eclipse.changelog*
%{eclipse_base}/plugins/com.redhat.eclipse.changelog*
%if %{gcj_support}
-%{_libdir}/gcj/%{name}
+%{_libdir}/gcj/%{name}/*
%endif
%changelog
+* Mon Sep 18 2006 Kyu Lee <klee at redhat.com> 2.3.1-1
+- Move from releng style build to 'package build' builds.
+- Import 2.3.1 - has improved error handling.
+- Enable support for all arches.
+
* Thu Sep 14 2006 Kyu Lee <klee at redhat.com> 2.3.0-1
- Import version 2.3.0 that fixes keybinding issue and version
-number issue.
+ number issue.
* Fri Sep 01 2006 Andrew Overholt <overholt at redhat.com> 2.2.3-1
- Minor specfile cleanups.
@@ -136,7 +114,7 @@
* Fri Sep 01 2006 Kyu Lee <klee at redhat.com> 2.2.3-1
- Import version 2.2.3 which has number of bug fixes, cleaning,
-and content formatter feature.
+ and content formatter feature.
* Fri Sep 01 2006 Ben Konrath <bkonrath at redhat.com> 2.2.2-3
- Require java-gcj-compat >= 1.0.64.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 15 Sep 2006 18:09:20 -0000 1.16
+++ sources 18 Sep 2006 18:47:30 -0000 1.17
@@ -1 +1 @@
-82f61afcc3416638ca48f488cf1237fb eclipse-changelog-fetched-2.3.0.tar.gz
+4d97c861fc6f4bb37abe5a1869cc1510 eclipse-changelog-src-2.3.1.zip
--- eclipse-changelog-build.properties.patch DELETED ---
--- eclipse-changelog-customTargets.xml.patch DELETED ---
More information about the fedora-cvs-commits
mailing list