From 59fd52f9eca8eeabc5ee419ca24acf312839b358 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jul 20 2015 13:02:50 +0000 Subject: Package is retired --- diff --git a/0001-Port-to-Java-8.patch b/0001-Port-to-Java-8.patch deleted file mode 100644 index b36e7c8..0000000 --- a/0001-Port-to-Java-8.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 34a42ce72fc9a640a59c26dd3ec6eed4b7115e59 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 21 Nov 2014 14:51:51 +0100 -Subject: [PATCH] Port to Java 8 - ---- - src/main/java/aQute/bnd/signing/Signer.java | 4 ++-- - src/main/java/aQute/lib/collections/MultiMap.java | 2 +- - src/main/java/aQute/lib/osgi/Analyzer.java | 4 ++-- - src/main/java/aQute/lib/osgi/Clazz.java | 6 ++++++ - src/main/java/aQute/lib/osgi/Jar.java | 2 +- - 5 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/main/java/aQute/bnd/signing/Signer.java b/src/main/java/aQute/bnd/signing/Signer.java -index bed91be..d3af5ef 100644 ---- a/src/main/java/aQute/bnd/signing/Signer.java -+++ b/src/main/java/aQute/bnd/signing/Signer.java -@@ -119,7 +119,7 @@ public class Signer extends Processor { - if (algorithms[a] != null) { - byte[] digest = algorithms[a].digest(manbytes); - ps.print(digestNames[a] + "-Digest-Manifest: "); -- ps.print(new Base64(digest)); -+ ps.print(new aQute.lib.base64.Base64(digest)); - ps.print("\r\n"); - } - } -@@ -142,7 +142,7 @@ public class Signer extends Processor { - if (algorithms[a] != null) { - byte[] digest = algorithms[a].digest(); - String header = digestNames[a] + "-Digest: " -- + new Base64(digest) + "\r\n"; -+ + new aQute.lib.base64.Base64(digest) + "\r\n"; - out.write(header.getBytes()); - } - } -diff --git a/src/main/java/aQute/lib/collections/MultiMap.java b/src/main/java/aQute/lib/collections/MultiMap.java -index 7672638..e5ccb7c 100644 ---- a/src/main/java/aQute/lib/collections/MultiMap.java -+++ b/src/main/java/aQute/lib/collections/MultiMap.java -@@ -24,7 +24,7 @@ public class MultiMap extends HashMap> { - return set.addAll(value); - } - -- public boolean remove( K key, V value ) { -+ public boolean remove( Object key, Object value ) { - Set set = get(key); - if ( set == null) { - return false; -diff --git a/src/main/java/aQute/lib/osgi/Analyzer.java b/src/main/java/aQute/lib/osgi/Analyzer.java -index 957269a..ee7291f 100644 ---- a/src/main/java/aQute/lib/osgi/Analyzer.java -+++ b/src/main/java/aQute/lib/osgi/Analyzer.java -@@ -2278,7 +2278,7 @@ public class Analyzer extends Processor { - if (hex) - return Hex.toHexString(digester.digest().digest()); - else -- return Base64.encodeBase64(digester.digest().digest()); -+ return aQute.lib.base64.Base64.encodeBase64(digester.digest().digest()); - } - - /** -@@ -2296,6 +2296,6 @@ public class Analyzer extends Processor { - throw new FileNotFoundException("From sha1, not found " + args[1]); - - IO.copy(r.openInputStream(), digester); -- return Base64.encodeBase64(digester.digest().digest()); -+ return aQute.lib.base64.Base64.encodeBase64(digester.digest().digest()); - } - } -diff --git a/src/main/java/aQute/lib/osgi/Clazz.java b/src/main/java/aQute/lib/osgi/Clazz.java -index cb5e1f0..e70b079 100644 ---- a/src/main/java/aQute/lib/osgi/Clazz.java -+++ b/src/main/java/aQute/lib/osgi/Clazz.java -@@ -311,6 +311,12 @@ public class Clazz { - 4, // 10 CONSTANT_MethodRef - 4, // 11 CONSTANT_InterfaceMethodRef - 4, // 12 CONSTANT_NameAndType -+ -1, // 13 Not defined -+ -1, // 14 Not defined -+ 3, // 15 CONSTANT_MethodHandle -+ 2, // 16 CONSTANT_MethodType -+ -1, // 17 Not defined -+ 4, // 18 CONSTANT_InvokeDynamic - }; - - boolean isAbstract; -diff --git a/src/main/java/aQute/lib/osgi/Jar.java b/src/main/java/aQute/lib/osgi/Jar.java -index c8b2359..8f1f98c 100644 ---- a/src/main/java/aQute/lib/osgi/Jar.java -+++ b/src/main/java/aQute/lib/osgi/Jar.java -@@ -624,7 +624,7 @@ public class Jar implements Closeable { - in.close(); - } - for (MessageDigest d : digests) -- attributes.putValue(d.getAlgorithm() + "-Digest", Base64.encodeBase64(d.digest())); -+ attributes.putValue(d.getAlgorithm() + "-Digest", aQute.lib.base64.Base64.encodeBase64(d.digest())); - } - } - --- -2.1.0 - diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec deleted file mode 100644 index 13762f9..0000000 --- a/aqute-bndlib.spec +++ /dev/null @@ -1,165 +0,0 @@ -Name: aqute-bndlib -Version: 1.50.0 -Release: 12%{?dist} -Summary: BND Library -License: ASL 2.0 -URL: http://www.aQute.biz/Code/Bnd -BuildArch: noarch - -Source0: http://repo1.maven.org/maven2/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.jar -Source1: http://repo1.maven.org/maven2/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.pom - -Patch0: 0001-Port-to-Java-8.patch - -BuildRequires: java-devel -BuildRequires: maven-local - -%description -The bnd tool helps you create and diagnose OSGi R4 bundles. -The key functions are: -- Show the manifest and JAR contents of a bundle -- Wrap a JAR so that it becomes a bundle -- Create a Bundle from a specification and a class path -- Verify the validity of the manifest entries -The tool is capable of acting as: -- Command line tool -- File format -- Directives -- Use of macros - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. - -%prep -%setup -q -c - -# fixing incomplete source directory structure -mkdir -p src/main/java target/classes -mv -f OSGI-OPT/src/* src/main/java/ - -%patch0 -p1 - -# removing bundled classess & junk -rm -rf OSGI-OPT -rm -rf META-INF -rm -rf src/main/java/aQute/bnd/test -find . -iname '*.class' -delete -find . -iname 'packageinfo' -delete - -# recycling all data files -mv -f aQute target/classes -mv -f org target/classes - -# for building with maven -cp %{SOURCE1} pom.xml - -# CR+LF -> LF -sed -i "s|\r||g" LICENSE - -%build -export LC_ALL=en_US.UTF-8 -%mvn_file :bndlib %{name} -%mvn_build - -%install -%mvn_install - -%files -f .mfiles -%doc LICENSE - -%files javadoc -f .mfiles-javadoc -%doc LICENSE - -%changelog -* Wed Jun 17 2015 Fedora Release Engineering - 1.50.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Apr 10 2015 Mikolaj Izdebski - 1.50.0-11 -- Add support for InvokeDynamic constant pool entry - -* Fri Nov 21 2014 Mikolaj Izdebski - 1.50.0-10 -- Port to Java 8 -- Resolves: rhbz#1105966 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.50.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 Mikolaj Izdebski - 1.50.0-8 -- Remove BuildRequires on maven-surefire-provider-junit4 - -* Tue Aug 13 2013 gil cattaneo 1.50.0-7 -- fix rhbz#991986 -- removed some rpmlint problems -- minor changes to adapt to current guideline - -* Sat Aug 03 2013 Fedora Release Engineering - 1.50.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.50.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.50.0-4 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jul 18 2012 Fedora Release Engineering - 1.50.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.50.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 21 2011 Jaromir Capik - 1.50.0-1 -- Update to 1.50.0 - -* Fri Dec 02 2011 Jaromir Capik - 1.43.0-2 -- Missing non-class files added - -* Thu Sep 15 2011 Jaromir Capik - 1.43.0-1 -- Update to 1.43.0 -- Spec file changes according to the latest guidelines - -* Mon Feb 07 2011 Fedora Release Engineering - 0:0.0.363-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 9 2010 Alexander Kurtakov 0:0.0.363-3 -- BR java-devel >= 1.6.0. - -* Tue Nov 9 2010 Alexander Kurtakov 0:0.0.363-2 -- Fix FTBFS. - -* Thu Sep 3 2009 Alexander Kurtakov 0:0.0.363-1 -- Update to 0.0.363. - -* Wed Aug 19 2009 Andrew Overholt 0:0.0.203-4.3 -- Add LICENSE -- Clean up Group tag - -* Mon Aug 17 2009 Andrew Overholt 0:0.0.203-4.2 -- Remove gcj support - -* Wed May 20 2009 Fernando Nasser 0:0.0.203-4.1 -- Remove unedded BRs at Andrew Overholt's recommendation -- Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid - noarch on 64-bit arches problem - -* Fri Mar 20 2009 Yong Yang 0.0.203-4 -- rebuild with new maven2 2.0.8 built in bootstrap mode -- merge from JPP-6 - -* Thu Jan 15 2009 David Walluck 0:0.0.203-3 -- fix build - -* Thu Jan 15 2009 Yong Yang 0.0.203-3jpp.1 -- Imported from dbhole's maven 2.0.8 packages, initial building - -* Tue Mar 11 2008 Deepak Bhole 0.0.203-2jpp.1 -- Import from JPackage + change per Fedora requirements - -* Thu Feb 14 2008 Ralph Apel - 0:0.0.203-2jpp -- Add several non class files to jar - -* Mon Jan 07 2008 Ralph Apel - 0:0.0.203-1jpp -- First release diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f06dcac --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +aqute-bndlib is now suppackage of aqute-bnd \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 32ad43f..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -87e30bfe9c465f29321df847fca76246 bndlib-1.50.0.jar -a8e1122c363ac51806b310348fb1aec0 bndlib-1.50.0.pom