[littleproxy] fix BR list
by gil
commit 90e114769c0e7255dc121f1e743455604dda5cf0
Author: gil <puntogil(a)libero.it>
Date: Mon Mar 31 10:23:06 2014 +0200
fix BR list
littleproxy.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/littleproxy.spec b/littleproxy.spec
index 550ac41..3481e15 100644
--- a/littleproxy.spec
+++ b/littleproxy.spec
@@ -9,8 +9,6 @@ URL: http://www.littleshoot.org/littleproxy/
Source0: %{name}-%{version}-src-git.tar.xz
# add netty 3.5.x support
Patch0: %{name}-%{version}-netty35.patch
-# remove: maven-assembly-plugin, maven-gpg-plugin
-Patch1: %{name}-%{version}-pom.patch
BuildRequires: java-devel
BuildRequires: sonatype-oss-parent
@@ -20,8 +18,10 @@ BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: ehcache-core
BuildRequires: log4j
-BuildRequires: netty
+BuildRequires: netty3
BuildRequires: slf4j
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
# test deps
BuildRequires: junit
@@ -44,13 +44,12 @@ This package contains javadoc for %{name}.
%prep
%setup -q
-%if %{?fedora} > 17
%patch0 -p1
%pom_remove_plugin :maven-assembly-plugin
%pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin
-%else
-%patch1 -p0
-%endif
+
+%pom_xpath_remove "pom:build/pom:extensions"
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'netty']/pom:version" 3
%build
10 years, 1 month
[apacheds] fix BR list
by gil
commit 339de861444d39fb219c6aa2d73fb44fee8f155c
Author: gil <puntogil(a)libero.it>
Date: Mon Mar 31 10:02:55 2014 +0200
fix BR list
apacheds.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/apacheds.spec b/apacheds.spec
index 2766ae3..006e5d7 100644
--- a/apacheds.spec
+++ b/apacheds.spec
@@ -26,6 +26,9 @@ BuildRequires: junit
BuildRequires: ldapjdk >= 0:4.18-11
BuildRequires: log4j
BuildRequires: slf4j
+BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
# BuildRequires: antlr
# BuildRequires: apache-commons-cli
10 years, 1 month
[apacheds-shared] fix BR list
by gil
commit c4dca3ae04e62fcbf42727e46865fba942aa0fef
Author: gil <puntogil(a)libero.it>
Date: Mon Mar 31 09:53:30 2014 +0200
fix BR list
apacheds-shared.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/apacheds-shared.spec b/apacheds-shared.spec
index f7a654c..f308244 100644
--- a/apacheds-shared.spec
+++ b/apacheds-shared.spec
@@ -23,6 +23,8 @@ BuildRequires: dom4j
BuildRequires: log4j
BuildRequires: slf4j
BuildRequires: xpp3
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
# test deps
BuildRequires: junit
10 years, 1 month
[gsbase] drop manual requires
by gil
commit 83940e335edd6b0ebce4103382bd640e58ec03b5
Author: gil <puntogil(a)libero.it>
Date: Mon Mar 31 09:23:58 2014 +0200
drop manual requires
gsbase.spec | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/gsbase.spec b/gsbase.spec
index dbad90f..5a15659 100644
--- a/gsbase.spec
+++ b/gsbase.spec
@@ -11,15 +11,9 @@ Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-
Patch0: %{name}-%{version}-jdk7.patch
BuildRequires: java-devel
-
BuildRequires: junit
BuildRequires: junitperf
-
BuildRequires: maven-local
-
-Requires: junit
-Requires: junitperf
-
BuildArch: noarch
%description
10 years, 1 month