[apache-commons-io] Update to 2.2
by Stanislav Ochotnicky
commit 3a710f04c3d67714d5a40f13ed62d21b596a1500
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Apr 4 14:05:33 2012 +0200
Update to 2.2
- Remove rpm bug workaround
- Finalize renaming from jakarta-comons-io
.gitignore | 1 +
apache-commons-io.spec | 20 +++++++-------------
sources | 2 +-
3 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc26235..ab75e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ commons-io-1.4-src.tar.gz
/commons-io-2.0-src.tar.gz
/commons-io-2.0.1-src.tar.gz
commons-io-2.1-src.tar.gz
+/commons-io-2.2-src.tar.gz
diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index ba6354b..814859c 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 2.1
-Release: 2%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Epoch: 1
Summary: Utilities to assist with developing IO functionality
License: ASL 2.0
@@ -22,10 +22,6 @@ BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-# This should go away with F-17
-Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: jakarta-%{short_name} <= 0:1.4
-
%description
Commons-IO contains utility classes, stream implementations,
file filters, and endian classes. It is a library of utilities
@@ -36,8 +32,6 @@ Summary: API documentation for %{name}
Group: Documentation
Requires: jpackage-utils
-Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.4
-
%description javadoc
This package contains the API documentation for %{name}.
@@ -65,11 +59,6 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*.jar
@@ -81,6 +70,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Apr 4 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:2.2-1
+- Update to 2.2
+- Remove rpm bug workaround
+- Finalize renaming from jakarta-comons-io
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index f0520c6..92f49d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-603b7c2205d48ab99774e669a4baa8f7 commons-io-2.1-src.tar.gz
+d2dbb604339bc1d9520b5a15e93abc1f commons-io-2.2-src.tar.gz
12 years, 1 month
[jsoup] Removing maven from Requires
by Jaromír Cápík
commit 4553265d94dd430f3a1fafa40e2657fdfbf08ebe
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Apr 4 13:19:19 2012 +0200
Removing maven from Requires
jsoup.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/jsoup.spec b/jsoup.spec
index 3dabccd..8f9b751 100644
--- a/jsoup.spec
+++ b/jsoup.spec
@@ -1,6 +1,6 @@
Name: jsoup
Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java library for working with real-world HTML
Group: Development/Libraries
@@ -22,7 +22,6 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: maven
Requires: jpackage-utils
Requires: java
@@ -85,6 +84,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Apr 04 2012 Jaromir Capik <jcapik(a)redhat.com> - 1.6.1-4
+- Removing maven from Requires
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 1 month
[Bug 788512] New: Drop indirect dependency to tomcat5
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Drop indirect dependency to tomcat5
https://bugzilla.redhat.com/show_bug.cgi?id=788512
Summary: Drop indirect dependency to tomcat5
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: tomcat
AssignedTo: ivan.afonichev(a)gmail.com
ReportedBy: kdaniel(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
ivan.afonichev(a)gmail.com
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Created attachment 560219
--> https://bugzilla.redhat.com/attachment.cgi?id=560219
A patch
jakarta-taglibs-standard was dependent on tomcat5.
It got updated, so tomcat needs to be specific about which version of it to
choose in order to get no tomcat5 dependency.
A scratch build with the patch succeeded:
http://koji.fedoraproject.org/koji/taskinfo?taskID=3771459
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 1 month
