[google-guice] Remove all requires
Michal Srb
msrb at fedoraproject.org
Thu Jan 31 09:24:32 UTC 2013
commit 0d15e7f3d396ac4a18a332fef467434c3ae85dd9
Author: Michal Srb <msrb at redhat.com>
Date: Thu Jan 31 10:23:08 2013 +0100
Remove all requires
- Correct usage of xmvn's macros
google-guice.spec | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
---
diff --git a/google-guice.spec b/google-guice.spec
index ce61908..2a7aa95 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -6,7 +6,7 @@
Name: google-%{short_name}
Version: 3.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Lightweight dependency injection framework for Java 5 and above
Group: Development/Libraries
License: ASL 2.0
@@ -45,7 +45,6 @@ BuildRequires: mvn(org.hsqldb:hsqldb-j5)
BuildRequires: testng
%endif
-Requires: %{short_name}-parent = %{version}-%{release}
Provides: %{short_name} = %{version}-%{release}
%description
@@ -78,8 +77,6 @@ and above. This package provides parent POM for Guice modules.
%package -n %{short_name}-assistedinject
Summary: AssistedInject extension module for Guice
-Requires: java
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-assistedinject
Guice is a lightweight dependency injection framework for Java 5
@@ -87,7 +84,6 @@ and above. This package provides AssistedInject module for Guice.
%package -n %{short_name}-extensions
Summary: Extensions for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-extensions
Guice is a lightweight dependency injection framework for Java 5
@@ -95,9 +91,6 @@ and above. This package provides extensions POM for Guice.
%package -n %{short_name}-grapher
Summary: Grapher extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
-Requires: %{short_name}-assistedinject = %{version}-%{release}
-Requires: %{short_name}-multibindings = %{version}-%{release}
%description -n %{short_name}-grapher
Guice is a lightweight dependency injection framework for Java 5
@@ -105,7 +98,6 @@ and above. This package provides Grapher module for Guice.
%package -n %{short_name}-jmx
Summary: JMX extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-jmx
Guice is a lightweight dependency injection framework for Java 5
@@ -113,7 +105,6 @@ and above. This package provides JMX module for Guice.
%package -n %{short_name}-jndi
Summary: JNDI extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-jndi
Guice is a lightweight dependency injection framework for Java 5
@@ -121,9 +112,6 @@ and above. This package provides JNDI module for Guice.
%package -n %{short_name}-multibindings
Summary: MultiBindings extension module for Guice
-Requires: java
-Requires: jpackage-utils
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-multibindings
Guice is a lightweight dependency injection framework for Java 5
@@ -131,7 +119,6 @@ and above. This package provides MultiBindings module for Guice.
%package -n %{short_name}-persist
Summary: Persist extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-persist
Guice is a lightweight dependency injection framework for Java 5
@@ -139,7 +126,6 @@ and above. This package provides Persist module for Guice.
%package -n %{short_name}-servlet
Summary: Servlet extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-servlet
Guice is a lightweight dependency injection framework for Java 5
@@ -147,7 +133,6 @@ and above. This package provides Servlet module for Guice.
%package -n %{short_name}-spring
Summary: Spring extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-spring
Guice is a lightweight dependency injection framework for Java 5
@@ -155,7 +140,6 @@ and above. This package provides Spring module for Guice.
%package -n %{short_name}-throwingproviders
Summary: ThrowingProviders extension module for Guice
-Requires: %{short_name} = %{version}-%{release}
%description -n %{short_name}-throwingproviders
Guice is a lightweight dependency injection framework for Java 5
@@ -198,13 +182,12 @@ This package provides %{summary}.
%build
%if %{with extensions}
-%mvn_alias ":guice-{assistedinject,grapher,jmx,jndi,multibindings,persist, \
- servlet,spring,throwingproviders}" "com.google.inject.extensions:guice- at 1"
+%mvn_alias ":guice-{assistedinject,grapher,jmx,jndi,multibindings,persist,\
+servlet,spring,throwingproviders}" "com.google.inject.extensions:guice- at 1"
%endif # with extensions
%mvn_file ":guice-{*}" %{short_name}/guice- at 1
-%mvn_file ":sisu-guice" %{short_name}/%{name}
-%mvn_file ":sisu-guice" %{name}
+%mvn_file ":sisu-guice" %{short_name}/%{name} %{name}
%mvn_alias ":sisu-guice" "com.google.inject:guice"
# Skip tests because of missing dependency (hsqldb-j5).
%mvn_build -f -s
@@ -232,10 +215,13 @@ This package provides %{summary}.
%files javadoc -f .mfiles-javadoc
%doc COPYING
-%{_javadocdir}/%{name}
%changelog
+* Thu Jan 31 2013 Michal Srb <msrb at redhat.com> - 3.1.2-10
+- Remove all requires
+- Correct usage of xmvn's macros
+
* Mon Jan 28 2013 Michal Srb <msrb at redhat.com> - 3.1.2-9
- Build with xmvn
More information about the scm-commits
mailing list