[lpg] Re-patch the OSGi manifest

[mbooth]

commit b02ed2b8c07e40bbf2813ec92e38f4e876713b63
Author: mbooth <fedora at matbooth.co.uk>
Date:   Mon Sep 13 23:57:48 2010 +0100

    Re-patch the OSGi manifest

 lpg-osgi-jar.patch |   16 ++++++++++------
 lpg.spec           |   10 +++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/lpg-osgi-jar.patch b/lpg-osgi-jar.patch
index ded076f..26bc028 100644
--- a/lpg-osgi-jar.patch
+++ b/lpg-osgi-jar.patch
@@ -1,16 +1,20 @@
---- lpg-java-runtime/META-INF/MANIFEST.MF	2009-05-18 23:09:59.000000000 +0100
-+++ lpg-java-runtime/META-INF/MANIFEST.MF	2009-07-04 16:26:41.204699558 +0100
-@@ -2,7 +2,7 @@
+--- lpg-java-runtime/META-INF/MANIFEST.MF.orig	2009-05-18 23:09:59.000000000 +0100
++++ lpg-java-runtime/META-INF/MANIFEST.MF	2010-09-13 23:44:45.667416113 +0100
+@@ -1,9 +1,9 @@
+ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: LPG Java Runtime
- Bundle-SymbolicName: lpg.runtime
+-Bundle-SymbolicName: lpg.runtime
 -Bundle-ClassPath: lpgruntime.jar
++Bundle-SymbolicName: lpg.runtime.java
 +Bundle-ClassPath: .
  Bundle-Version: 2.0.17
  Bundle-Vendor: pcharles at us.ibm.com
  Bundle-Localization: plugin
---- lpg-java-runtime/exportPlugin.xml	2009-02-18 23:14:10.000000000 +0000
-+++ lpg-java-runtime/exportPlugin.xml	2009-07-04 16:41:44.509545672 +0100
+-Export-Package: lpg.runtime
++Export-Package: lpg.runtime; version="2.0.17"
+--- lpg-java-runtime/exportPlugin.xml.orig	2009-02-18 23:14:10.000000000 +0000
++++ lpg-java-runtime/exportPlugin.xml	2010-09-13 23:43:15.110665531 +0100
 @@ -70,9 +70,6 @@
          <!-- Copy necessary resources -->
  
diff --git a/lpg.spec b/lpg.spec
index b6b418b..6ba5148 100644
--- a/lpg.spec
+++ b/lpg.spec
@@ -3,7 +3,7 @@
 
 Name:      lpg
 Version:   %{_version}
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   LALR Parser Generator
 Group:     Development/Libraries
 # although the text of the licence isn't distributed with some of the source,
@@ -91,8 +91,8 @@ cp -p %{SOURCE4} lpgdistribution/build.xml
 cp -p %{SOURCE5} lpgdistribution/MANIFEST.MF
 
 # apply patches
-%patch0 -p0
-%patch1 -p0
+%patch0 -p0 -b .orig
+%patch1 -p0 -b .orig
 
 %build
 # build java stuff
@@ -147,6 +147,10 @@ rm -rf %{buildroot}
 %{_javadir}/%{name}javaruntime*
 
 %changelog
+* Mon Sep 13 2010 Mat Booth <fedora at matbooth.co.uk> 2.0.17-5
+- Re-patch the OSGi manifest because for some reason Eclipse Orbit decided
+  not to use the same symbolic bundle name as LPG upstream did.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild