[maven-ear-plugin] Update to upstream version 2.10
by Michal Srb
commit 3c779a10675e552eb250dda8867601548f87fe34
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Mar 6 11:29:53 2015 +0100
Update to upstream version 2.10
- Adapt to current packaging guidelines
.gitignore | 1 +
maven-ear-plugin.spec | 78 +++++++++++++++++----------------------------------
sources | 2 +-
3 files changed, 27 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0065222..1ae1456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ maven-ear-plugin-2.4.2.tar.bz2
/maven-ear-plugin-2.6-source-release.zip
/maven-ear-plugin-2.7-source-release.zip
/maven-ear-plugin-2.8-source-release.zip
+/maven-ear-plugin-2.10-source-release.zip
diff --git a/maven-ear-plugin.spec b/maven-ear-plugin.spec
index 2c352a2..b85e3c2 100644
--- a/maven-ear-plugin.spec
+++ b/maven-ear-plugin.spec
@@ -1,41 +1,29 @@
Name: maven-ear-plugin
-Version: 2.8
-Release: 7%{?dist}
+Version: 2.10
+Release: 1%{?dist}
Summary: Maven EAR Plugin
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-ear-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: junit
-BuildRequires: maven-local
-BuildRequires: maven-archiver
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-annotations
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-shared-filtering
-BuildRequires: maven-shared-verifier
-BuildRequires: maven-surefire-plugin
-BuildRequires: plexus-archiver
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
-BuildRequires: xmlunit
-
-Requires: maven
-Requires: jpackage-utils
-Requires: maven-plugin-annotations
-Requires: plexus-archiver
-Requires: plexus-containers-container-default
-Requires: plexus-utils
+BuildRequires: maven-local
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven:maven-archiver)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires: mvn(org.apache.maven.shared:maven-filtering)
+BuildRequires: mvn(org.apache.maven.shared:maven-verifier)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(xmlunit:xmlunit)
Obsoletes: maven2-plugin-ear <= 0:2.0.8
Provides: maven2-plugin-ear = 0:%{version}-%{release}
@@ -44,9 +32,7 @@ Provides: maven2-plugin-ear = 0:%{version}-%{release}
Generates a J2EE Enterprise Archive (EAR) file.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -55,37 +41,23 @@ API documentation for %{name}.
%prep
%setup -q
-# Was missing
-%pom_add_dep org.codehaus.plexus:plexus-container-default:1.0
-
%build
-mvn-rpmbuild \
- -Dmaven.test.skip=true \
- install javadoc:aggregate
+%mvn_build -f
%install
-# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Fri Mar 06 2015 Michal Srb <msrb(a)redhat.com> - 2.10-1
+- Update to upstream version 2.10
+- Adapt to current packaging guidelines
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index ec12562..6907fbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ee6bf6b0bb3c9dd068ef05932549809 maven-ear-plugin-2.8-source-release.zip
+01c8c9b8216015b58144cbdb8fa81036 maven-ear-plugin-2.10-source-release.zip
9 years, 3 months
[solr] rebuilt with new jhighlight
by gil
commit 55e4dd760cef734d11938cca101d59dbef640907
Author: gil <puntogil(a)libero.it>
Date: Fri Mar 6 11:05:24 2015 +0100
rebuilt with new jhighlight
solr.spec | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 3cfa898..bfff787 100644
--- a/solr.spec
+++ b/solr.spec
@@ -10,7 +10,7 @@
%endif
Name: solr
Version: 4.10.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Ultra-fast Lucene-based Search Server
# MIT/X11 (BSD like) solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java
License: ASL 2.0 and BSD
@@ -30,7 +30,7 @@ BuildRequires: mvn(com.ibm.icu:icu4j)
BuildRequires: mvn(com.spatial4j:spatial4j)
BuildRequires: mvn(com.sun.mail:gimap)
BuildRequires: mvn(com.sun.mail:javax.mail)
-BuildRequires: mvn(com.uwyn:jhighlight)
+BuildRequires: mvn(org.codelibs:jhighlight)
BuildRequires: mvn(commons-cli:commons-cli)
BuildRequires: mvn(commons-codec:commons-codec)
BuildRequires: mvn(commons-fileupload:commons-fileupload)
@@ -392,6 +392,14 @@ for p in solr/core \
%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']" "<version>1.2.17</version>" ${p}
done
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/dataimporthandler-extras
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/extraction
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/langid
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/map-reduce
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/morphlines-cell
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/morphlines-core
+
%build
# Test skipped for unavailable test deps {lucene,solr}/test-framework
@@ -409,6 +417,9 @@ done
%license LICENSE.txt NOTICE.txt
%changelog
+* Fri Mar 06 2015 gil cattaneo <puntogil(a)libero.it> 4.10.3-2
+- rebuilt with new jhighlight
+
* Wed Dec 24 2014 gil cattaneo <puntogil(a)libero.it> 4.10.3-1
- update to 4.10.3
9 years, 3 months
[tomcat] Update to tomcat 8.0.20.
by Alexander Kurtakov
commit c2e91f9ffc469f42c55530f85b0a77819b49daea
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Mar 6 12:01:37 2015 +0200
Update to tomcat 8.0.20.
sources | 2 +-
tomcat.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index f4fa4f5..86d2311 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a57119b64a853c796de6b319effae632 apache-tomcat-8.0.18-src.tar.gz
+6006e1de147f2e71668fba49238fdd8a apache-tomcat-8.0.20-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 4abe4d7..5dfb5e3 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.3
%global major_version 8
%global minor_version 0
-%global micro_version 18
+%global micro_version 20
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.1
%global elspec 3.0
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
9 years, 3 months
[tika] rebuilt with new jhighlight
by gil
commit 96adc648d41d760534c5277681c0e66f26f8f595
Author: gil <puntogil(a)libero.it>
Date: Fri Mar 6 10:44:49 2015 +0100
rebuilt with new jhighlight
tika.spec | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/tika.spec b/tika.spec
index 47249f3..daf795a 100644
--- a/tika.spec
+++ b/tika.spec
@@ -8,7 +8,7 @@
Name: tika
Version: 1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A content analysis toolkit
License: ASL 2.0
Url: http://tika.apache.org/
@@ -32,7 +32,7 @@ BuildRequires: mvn(org.gagravarr:vorbis-java-tika)
%if %{without tika_parsers}
BuildRequires: mvn(com.adobe.xmp:xmpcore)
BuildRequires: mvn(com.drewnoakes:metadata-extractor:2)
-BuildRequires: mvn(com.uwyn:jhighlight)
+BuildRequires: mvn(org.codelibs:jhighlight)
BuildRequires: mvn(org.gagravarr:vorbis-java-core)
BuildRequires: mvn(com.googlecode.juniversalchardet:juniversalchardet)
BuildRequires: mvn(commons-codec:commons-codec)
@@ -219,6 +219,8 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegr
# NoClassDefFoundError: org/w3c/dom/ElementTraversal
%pom_add_dep xml-apis:xml-apis::test %{name}-parsers
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs %{name}-parsers
+
%build
# skip tests for now because there are test failures:
# Tests which use cglib fail because of incompatibility with asm4
@@ -261,6 +263,9 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegr
%license LICENSE.txt NOTICE.txt
%changelog
+* Fri Mar 06 2015 gil cattaneo <puntogil(a)libero.it> 1.5-3
+- rebuilt with new jhighlight
+
* Mon Feb 16 2015 gil cattaneo <puntogil(a)libero.it> 1.5-2
- introduce license macro
9 years, 3 months
Broken dependencies: jenkins
by Fedora Koji Build System
jenkins has broken dependencies in the rawhide tree:
On x86_64:
jenkins-webapp-1.598-2.fc23.noarch requires jakarta-taglibs-standard
On i386:
jenkins-webapp-1.598-2.fc23.noarch requires jakarta-taglibs-standard
On armhfp:
jenkins-webapp-1.598-2.fc23.noarch requires jakarta-taglibs-standard
Please resolve this as soon as possible.
9 years, 3 months
Broken dependencies: cargo-resources
by Fedora Koji Build System
cargo-resources has broken dependencies in the rawhide tree:
On x86_64:
cargo-resources-1.4.2-5.fc22.noarch requires tomcat-servlet-3.0-api
On i386:
cargo-resources-1.4.2-5.fc22.noarch requires tomcat-servlet-3.0-api
On armhfp:
cargo-resources-1.4.2-5.fc22.noarch requires tomcat-servlet-3.0-api
Please resolve this as soon as possible.
9 years, 3 months
