rpms/eclipse-epic/F-9 .cvsignore, 1.2, 1.3 eclipse-epic.spec, 1.1, 1.2 get-epic.sh, 1.1, 1.2 sources, 1.2, 1.3 epic-jdom-api-changes.patch, 1.1, NONE

[Mat Booth (mbooth)]

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-epic/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24476

Modified Files:
	.cvsignore eclipse-epic.spec get-epic.sh sources 
Removed Files:
	epic-jdom-api-changes.patch 
Log Message:
* Mon May 05 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.23-1
- Updated to version 0.6.23.
- Removed JDOM API patch that was moved upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Apr 2008 20:12:57 -0000	1.2
+++ .cvsignore	5 May 2008 21:30:33 -0000	1.3
@@ -1 +1 @@
-epic-0.6.22.tar.gz
+epic-0.6.23.tar.gz


Index: eclipse-epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/eclipse-epic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-epic.spec	30 Apr 2008 20:12:57 -0000	1.1
+++ eclipse-epic.spec	5 May 2008 21:30:33 -0000	1.2
@@ -2,8 +2,8 @@
 %define gcj_support      1
 
 Name:      eclipse-epic
-Version:   0.6.22
-Release:   4%{?dist}
+Version:   0.6.23
+Release:   1%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -15,9 +15,6 @@
 Source0:   epic-%{version}.tar.gz
 Source1:   get-epic.sh
 
-# patch for api changes in newer version of jdom that ships w/Fedora
-Patch0:    epic-jdom-api-changes.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
@@ -55,12 +52,13 @@
 %setup -q -n epic-%{version}
 
 # ditch bundled libs in favor of building against fedora packaged libs
-rm org.epic.lib/lib/jdom.jar \
+rm org.epic.lib/lib/jdom-1.1.jar \
    org.epic.lib/lib/antlr-2.7.5.jar \
    org.epic.lib/lib/brazil_mini.jar \
    org.epic.lib/lib/gnu-regexp-1.1.4.jar
 build-jar-repository -s -p org.epic.lib/lib jdom antlr gnu-regexp brazil
 
+grep -lR jdom-1.1 *         | xargs sed --in-place "s/jdom-1.1/jdom/"
 grep -lR antlr-2.7.5 *      | xargs sed --in-place "s/antlr-2.7.5/antlr/"
 grep -lR gnu-regexp-1.1.4 * | xargs sed --in-place "s/gnu-regexp-1.1.4/gnu-regexp/"
 grep -lR brazil_mini *      | xargs sed --in-place "s/brazil_mini/brazil/"
@@ -87,9 +85,6 @@
    exit 1
 fi
 
-# apply patches
-%patch0 -p0
-
 %build
 # parse grammar for grammar parser
 pushd org.epic.perleditor/src/org/epic/core/parser/
@@ -114,7 +109,7 @@
 build-jar-repository -s -p . jdom antlr gnu-regexp brazil
 popd
 
-# make sure source packages are correctly verisoned
+# ensure source packages are correctly verisoned
 pushd %{buildroot}%{eclipse_base}/plugins
 for p in org.epic.perleditor \
          org.epic.regexp \
@@ -152,6 +147,10 @@
 %endif
 
 %changelog
+* Mon May 05 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.23-1
+- Updated to version 0.6.23.
+- Removed JDOM API patch that was moved upstream.
+
 * Tue Apr 29 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.22-4
 - Added missing dependency.
 - Build the source plugin properly to support the "import as projects with


Index: get-epic.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/get-epic.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- get-epic.sh	30 Apr 2008 20:12:57 -0000	1.1
+++ get-epic.sh	5 May 2008 21:30:33 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/sh
 NAME="epic"
-VERSION=0.6.22
-TAG="testing_0_6_22"
+VERSION=0.6.23
+TAG="testing_0_6_23"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Apr 2008 20:12:57 -0000	1.2
+++ sources	5 May 2008 21:30:33 -0000	1.3
@@ -1 +1 @@
-09b6c4697308b23c6c98028e196ff838  epic-0.6.22.tar.gz
+0afd9c8401c6c1a4164833235d996cd6  epic-0.6.23.tar.gz


--- epic-jdom-api-changes.patch DELETED ---