[logback/f17] Remove F16 backward compatibility
mef
mef at fedoraproject.org
Fri Dec 21 11:15:41 UTC 2012
commit 9d77348bcd6572ff55f555fe379d5cd454b59137
Author: Mary Ellen Foster <mefoster at gmail.com>
Date: Fri Dec 21 11:15:24 2012 +0000
Remove F16 backward compatibility
....6-access-exclude-unavailable-tomcat-apis.patch | 19 -------------
logback-1.0.9-jetty6.patch | 28 --------------------
logback.spec | 22 +++------------
3 files changed, 4 insertions(+), 65 deletions(-)
---
diff --git a/logback.spec b/logback.spec
index 2ce8498..c4d9c0e 100644
--- a/logback.spec
+++ b/logback.spec
@@ -1,7 +1,7 @@
%global with_maven 0
Name: logback
Version: 1.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Java logging library
Group: Development/Tools
@@ -13,9 +13,6 @@ Source2: %{name}-%{version}-core-osgi.bnd
Source3: %{name}-%{version}-classic-osgi.bnd
Source4: %{name}-%{version}-access-osgi.bnd
-Patch0: %{name}-1.0.6-access-exclude-unavailable-tomcat-apis.patch
-Patch1: %{name}-1.0.9-jetty6.patch
-
# Java dependencies
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
@@ -131,22 +128,8 @@ logback-examples module.
%prep
%setup -q
-%if %{?fedora}<=16
-%patch0 -p0
-# Use old Jetty API on F16
-%patch1 -p0
-find logback-access/src/main/java/ch/qos/logback/access/jetty -name "*.java" -exec sed -i 's/org.eclipse.jetty.http/org.mortbay.jetty/g' '{}' \;
-find logback-access/src/main/java/ch/qos/logback/access/jetty -name "*.java" -exec sed -i 's/org.eclipse.jetty.server/org.mortbay.jetty/g' '{}' \;
%if !%with_maven
cp -p %{SOURCE4} osgi-access.bnd
-sed -i "s|org.eclipse.jetty.http|org.mortbay.jetty|" osgi-access.bnd
-sed -i "s|org.eclipse.jetty.server|org.mortbay.jetty|" osgi-access.bnd
-sed -i "s|org.eclipse.jetty.util.component|org.mortbay.component|" osgi-access.bnd
-%endif
-%else
-%if !%with_maven
-cp -p %{SOURCE4} osgi-access.bnd
-%endif
%endif
%pom_remove_plugin org.scala-tools:maven-scala-plugin %{name}-core
@@ -242,6 +225,9 @@ cp -r %{name}-examples/pom.xml %{name}-examples/src %{buildroot}%{_datadir}/%{na
%{_mavenpomdir}/JPP.%{name}-%{name}-examples.pom
%changelog
+* Fri Dec 21 2012 Mary Ellen Foster <mefoster at gmail.com> - 1.0.9-2
+- Remove F16 backward compatibility since it's EOL soon
+
* Sat Dec 08 2012 gil cattaneo <puntogil at libero.it> - 1.0.9-1
- Update to 1.0.9
- Preserved timestamp in pom files
More information about the scm-commits
mailing list