[java-base64] patched for compatibility with ElasticSearch

gil gil at fedoraproject.org
Wed Feb 18 22:58:31 UTC 2015


commit fd82d5597c22d1119e43144054d4d968c5c0778c
Author: gil <puntogil at libero.it>
Date:   Wed Feb 18 23:58:17 2015 +0100

    patched for compatibility with ElasticSearch

 java-base64.spec |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/java-base64.spec b/java-base64.spec
index 8425b30..cf6053f 100644
--- a/java-base64.spec
+++ b/java-base64.spec
@@ -1,7 +1,7 @@
 %global oname base64
 Name:          java-base64
 Version:       2.3.8
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Java class for encoding and decoding Base64 notation
 # pom file license comment
 # I have released this software into the Public Domain. That
@@ -15,15 +15,11 @@ Summary:       Java class for encoding and decoding Base64 notation
 License:       Public Domain
 URL:           http://iharder.net/base64/
 Source0:       https://github.com/omalley/base64/archive/release-%{version}.tar.gz
-
-BuildRequires: java-devel
+Patch0:        %{name}-2.3.8-elasticsearch.patch
 
 # test deps
 BuildRequires: junit
-
 BuildRequires: maven-local
-BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-provider-junit
 Provides:      %{oname} = %{version}-%{release}
 BuildArch:     noarch
 
@@ -40,21 +36,22 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{oname}-release-%{version}
-
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-compiler-plugin']" "<version>2.5.1</version>"
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-source-plugin']" "<version>2.1.2</version>"
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-javadoc-plugin']" "<version>2.9</version>"
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-release-plugin']" "<version>2.2.1</version>"
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-scm-plugin']" "<version>1.7</version>"
-%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId ='maven-project-info-reports-plugin']" "<version>2.4</version>"
-%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId ='maven-javadoc-plugin']" "<version>2.9</version>"
+%patch0 -p0
 
 sed -i "s|<version>2.3.9-SNAPSHOT</version>|<version>%{version}</version>|" pom.xml
 
-%build
+# Unwanted
+%pom_remove_plugin :maven-release-plugin
+%pom_remove_plugin :maven-scm-plugin
+# Unwanted - disable javadoc source jar
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-javadoc-plugin
 
 %mvn_file :%{oname} %{name}
 %mvn_file :%{oname} %{oname}
+
+%build
+
 %mvn_build
 
 %install
@@ -71,6 +68,9 @@ sed -i "s|<version>2.3.9-SNAPSHOT</version>|<version>%{version}</version>|" pom.
 %{_javadocdir}/%{oname}
 
 %changelog
+* Wed Feb 18 2015 gil cattaneo <puntogil at libero.it> 2.3.8-7
+- patched for compatibility with ElasticSearch
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -89,4 +89,4 @@ sed -i "s|<version>2.3.9-SNAPSHOT</version>|<version>%{version}</version>|" pom.
 - fix javadoc name, added symlink
 
 * Sun Apr 28 2013 gil cattaneo <puntogil at libero.it> 2.3.8-1
-- initial rpm
\ No newline at end of file
+- initial rpm


More information about the scm-commits mailing list