rpms/eclipse-changelog/devel eclipse-changelog.spec,1.67,1.68

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Tue Aug 5 13:15:32 UTC 2008


Author: overholt

Update of /cvs/pkgs/rpms/eclipse-changelog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21887

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1:2.6.2-2
- Update for Eclipse SDK 3.4


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- eclipse-changelog.spec	24 Jul 2008 21:07:31 -0000	1.67
+++ eclipse-changelog.spec	5 Aug 2008 13:15:02 -0000	1.68
@@ -1,11 +1,11 @@
 Epoch: 1
 
 %define gcj_support     1
-%define eclipse_base    %{_datadir}/eclipse
+%define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
 Version:        2.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
 Group:          Development/Tools 
@@ -69,32 +69,13 @@
 %setup -q -c -n eclipse-changelog-%{version}
 
 %build
-# See comments in the script to understand this.
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} cdt
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main ChangeLog feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Duser.home=$homedir                              \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.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
+%{eclipse_base}/buildscripts/pdebuild
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+installDir=%{eclipse_base}/dropins/changelog
+install -d -m 755 $installDir
+unzip -q -d $installDir \
  build/rpmBuild/org.eclipse.linuxtools.changelog.zip
 
 %if %{gcj_support}
@@ -111,12 +92,8 @@
 
 %files
 %defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.linuxtools.changelog_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.core_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.cparser_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.parsers.java_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.doc_*
-%doc %{eclipse_base}/features/org.eclipse.linuxtools.changelog_*/epl-v10.html
+%doc org.eclipse.linuxtools.changelog-feature/epl-v10.html
+%{eclipse_base}/dropins/changelog
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.core_*
@@ -125,6 +102,9 @@
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1:2.6.2-2
+- Update for Eclipse SDK 3.4
+
 * Thu Jun 26 2008 Jeff Johnston <jjohnstn at redhat.com> 1:2.6.2-1
 - Rebase to 2.6.2
 - Resolves Bugzilla #452574




More information about the fedora-extras-commits mailing list