[eclipse-epic] Update to upstream 0.6.44 version.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Apr 19 14:28:39 UTC 2012


commit efcaf294dea1f9faa8f67ba8438cafae034d61f6
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Apr 19 17:28:26 2012 +0300

    Update to upstream 0.6.44 version.
    
    - Drop unneeded parts of the spec.

 .gitignore                               |    1 +
 eclipse-epic-enable-module-starter.patch |   21 ++++++----------
 eclipse-epic.spec                        |   32 ++++++++----------------
 get-epic.sh                              |   38 ------------------------------
 sources                                  |    2 +-
 5 files changed, 21 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7254a6..8c46752 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 epic-0.6.35.tar.gz
 epic-0.6.39.tar.gz
+jploski-epic-ide-273ac0e.tar.gz
diff --git a/eclipse-epic-enable-module-starter.patch b/eclipse-epic-enable-module-starter.patch
index 70dd7dc..73e4cb3 100644
--- a/eclipse-epic-enable-module-starter.patch
+++ b/eclipse-epic-enable-module-starter.patch
@@ -1,23 +1,18 @@
-Index: src/org/epic/perleditor/preferences/PreferenceConstants.java
-===================================================================
-RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/preferences/PreferenceConstants.java,v
-retrieving revision 1.18
-diff -u -r1.18 PreferenceConstants.java
---- src/org/epic/perleditor/preferences/PreferenceConstants.java	10 Aug 2008 13:38:06 -0000	1.18
-+++ src/org/epic/perleditor/preferences/PreferenceConstants.java	16 Mar 2009 23:42:13 -0000
-@@ -667,7 +667,7 @@
-         store.setDefault(BROWSER_START_URL, "http://"); //$NON-NLS-1$
-         
-         store.setDefault(DEBUG_INTERPRETER_TYPE, DEBUG_INTERPRETER_TYPE_STANDARD);
+--- org.epic.perleditor/src/org/epic/perleditor/preferences/PreferenceConstants.java.orig	2012-04-18 23:30:04.000000000 +0300
++++ org.epic.perleditor/src/org/epic/perleditor/preferences/PreferenceConstants.java	2012-04-19 17:21:29.063709145 +0300
+@@ -453,7 +453,7 @@ public class PreferenceConstants
+ 
+         store.setDefault(DEBUG_INTERPRETER_TYPE,
+             DEBUG_INTERPRETER_TYPE_STANDARD);
 -        store.setDefault(DEBUG_PERL_EXECUTABLE, "perl"); //$NON-NLS-1$
 +        store.setDefault(DEBUG_PERL_EXECUTABLE, "perl -T"); //$NON-NLS-1$
          store.setDefault(DEBUG_SHOW_WARNINGS, true);
          store.setDefault(DEBUG_TAINT_MODE, false);
          store.setDefault(DEBUG_DEBUG_CONSOLE, false);
-@@ -745,7 +745,7 @@
+@@ -516,7 +516,7 @@ public class PreferenceConstants
          store.setDefault(EDITOR_NUMBER_COLOR_BOLD, false);
          store.setDefault(EDITOR_INVALID_COLOR_BOLD, false);
-         
+ 
 -        store.setDefault(MODULE_STARTER_ENABLED, false);
 +        store.setDefault(MODULE_STARTER_ENABLED, true);
          store.setDefault(MODULE_STARTER_DEFAULT_LOCATION, true);
diff --git a/eclipse-epic.spec b/eclipse-epic.spec
index dae9ae0..0451843 100644
--- a/eclipse-epic.spec
+++ b/eclipse-epic.spec
@@ -1,24 +1,17 @@
-%define eclipse_base     %{_libdir}/eclipse
-
 Name:      eclipse-epic
-Version:   0.6.39
-Release:   2%{?dist}
+Version:   0.6.44
+Release:   1%{?dist}
 Summary:   Perl Eclipse plug-in
 Group:     Development/Tools
 License:   CPL
 URL:       http://www.epic-ide.org/
 
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-epic.sh
-Source0:   epic-%{version}.tar.gz
-Source1:   get-epic.sh
+# Fetched from https://github.com/jploski/epic-ide/tarball/testing
+Source0:   jploski-epic-ide-273ac0e.tar.gz
 
 # enable module starter and taint checking by default
 Patch0:    %{name}-enable-module-starter.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:        noarch
 
 BuildRequires:    java-devel
@@ -48,12 +41,10 @@ perldoc support, source formatter, templating support, a regular expression
 view and a Perl debugger.
 
 %prep
-%setup -q -n epic-%{version}
+%setup -q -n jploski-epic-ide-273ac0e
 
 # apply patches
-pushd org.epic.perleditor
-%patch0 -p0
-popd
+%patch0 
 
 # remove all bundled libs
 find -name '*.class' -exec rm -f '{}' \;
@@ -86,11 +77,10 @@ done
 popd
 
 # build the main feature
-%{eclipse_base}/buildscripts/pdebuild -f org.epic.feature.main \
+eclipse-pdebuild -f org.epic.feature.main \
   -a "-DjavacTarget=1.4 -DjavacSource=1.4"
 
 %install
-rm -rf %{buildroot}
 installDir=%{buildroot}%{_datadir}/eclipse/dropins/epic
 install -d -m 755 $installDir
 unzip -q -d $installDir build/rpmBuild/org.epic.feature.main.zip
@@ -112,15 +102,15 @@ for p in org.epic.perleditor \
 done
 popd
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc org.epic.feature.main/license.html
 %{_datadir}/eclipse/dropins/epic
 
 %changelog
+* Thu Apr 19 2012 Alexander Kurtakov <akurtako at redhat.com> 0.6.44-1
+- Update to upstream 0.6.44 version.
+- Drop unneeded parts of the spec.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.39-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index ee5ffb4..367778e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-adefeb127fd43b6fde6f44e55fbec6c8  epic-0.6.39.tar.gz
+20ca53389c9bda367948ccc880b5391c  jploski-epic-ide-273ac0e.tar.gz


More information about the scm-commits mailing list