rpms/eclipse-epic/devel eclipse-epic.spec,1.4,1.5

Mat Booth (mbooth) fedora-extras-commits at redhat.com
Sun Aug 10 11:04:10 UTC 2008


Author: mbooth

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

Modified Files:
	eclipse-epic.spec 
Log Message:
* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 0.6.24-3
- Update for building with Eclipse SDK 3.4.




Index: eclipse-epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/eclipse-epic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-epic.spec	14 Jun 2008 12:37:41 -0000	1.4
+++ eclipse-epic.spec	10 Aug 2008 11:03:40 -0000	1.5
@@ -1,13 +1,13 @@
-%define eclipse_base     %{_datadir}/eclipse
+%define eclipse_base     %{_libdir}/eclipse
 %define gcj_support      1
 
 Name:      eclipse-epic
 Version:   0.6.24
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
-URL:       http://e-p-i-c.sourceforge.net/
+URL:       http://www.epic-ide.org/
 
 # source tarball and the script used to generate it from upstream's source control
 # script usage:
@@ -27,14 +27,14 @@
 %endif
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde
+BuildRequires:    eclipse-pde >= 3.4
 BuildRequires:    antlr
 BuildRequires:    jdom
 BuildRequires:    gnu-regexp
 BuildRequires:    brazil
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform
+Requires:         eclipse-platform >= 3.4
 Requires:         antlr
 Requires:         jdom
 Requires:         gnu-regexp
@@ -99,18 +99,19 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/org.epic.feature.main.zip
+installDir=%{buildroot}%{_datadir}/eclipse/dropins/epic
+install -d -m 755 $installDir
+unzip -q -d $installDir build/rpmBuild/org.epic.feature.main.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-pushd %{buildroot}%{eclipse_base}/plugins/org.epic.lib_*/lib
+pushd $installDir/eclipse/plugins/org.epic.lib_*/lib
 rm *.jar
 build-jar-repository -s -p . jdom antlr gnu-regexp brazil
 popd
 
 # ensure source packages are correctly verisoned
-pushd %{buildroot}%{eclipse_base}/plugins
+pushd $installDir/eclipse/plugins
 for p in org.epic.perleditor \
          org.epic.regexp \
          org.epic.debug; do
@@ -133,19 +134,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{eclipse_base}/features/org.epic.feature.main_%{version}/license.html
-%{eclipse_base}/features/org.epic.feature.main_*
-%{eclipse_base}/plugins/org.epic.debug_*
-%{eclipse_base}/plugins/org.epic.doc_*
-%{eclipse_base}/plugins/org.epic.lib_*
-%{eclipse_base}/plugins/org.epic.perleditor_*
-%{eclipse_base}/plugins/org.epic.regexp_*
-%{eclipse_base}/plugins/org.epic.source_*
+%doc org.epic.feature.main/license.html
+%{_datadir}/eclipse/dropins/epic
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 0.6.24-3
+- Update for building with Eclipse SDK 3.4.
+
 * Sat Jun 14 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.24-2
 - Fixed package ownership of feature directory.
 




More information about the fedora-extras-commits mailing list