.gitignore

@@ -1 +1 @@
-SOURCES/google-guice-4.2.2.tar.xz
+SOURCES/google-guice-4.1.tar.xz

.google-guice.metadata

@@ -1 +1 @@
-b6026a2dca56aae1b1f7ebab2cd28b2d8445c2d8 SOURCES/google-guice-4.2.2.tar.xz
+960d2670c1297839c5998ea60a53d3bd5c8ce1c7 SOURCES/google-guice-4.1.tar.xz

SPECS/google-guice.spec

@@ -1,31 +1,53 @@
-Name:           google-guice
+%bcond_without jpa
-Version:        4.2.2
+%bcond_without spring
-Release:        4%{?dist}
+
+%global short_name guice
+
+Name:           google-%{short_name}
+Version:        4.1
+Release:        11%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
 License:        ASL 2.0
-URL:            https://github.com/google/guice
+URL:            https://github.com/google/%{short_name}
 BuildArch:      noarch
 
 # ./create-tarball.sh %%{version}
 Source0:        %{name}-%{version}.tar.xz
 Source1:        create-tarball.sh
 
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
-BuildRequires:  %{?module_prefix}mvn(aopalliance:aopalliance)
+BuildRequires:  mvn(aopalliance:aopalliance)
 BuildRequires:  mvn(cglib:cglib)
-BuildRequires:  %{?module_prefix}mvn(com.google.guava:guava)
+BuildRequires:  mvn(com.google.guava:guava:19.0)
-BuildRequires:  %{?module_prefix}mvn(javax.inject:javax.inject)
+BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.sonatype.plugins:munge-maven-plugin)
 # xmvn-builddep misses this:
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 
+%if %{with jpa}
+BuildRequires:  hibernate-jpa-2.0-api
+%endif
+%if %{with spring}
+BuildRequires:  springframework-beans
+%endif
+
+# Test dependencies:
+%if 0
+BuildRequires:  maven-surefire-provider-testng
+BuildRequires:  aqute-bnd
+BuildRequires:  atinject-tck
+BuildRequires:  easymock2
+BuildRequires:  felix-framework
+BuildRequires:  hibernate3-entitymanager
+BuildRequires:  mvn(org.hsqldb:hsqldb-j5)
+BuildRequires:  testng
+%endif
 
 %description
 Put simply, Guice alleviates the need for factories and the use of new
@@ -46,83 +68,110 @@ with at least three use cases. When in doubt, we leave it out. We
 build general functionality which enables you to extend Guice rather
 than adding every feature to the core framework.
 
-%package -n guice-parent
+%package -n %{short_name}-parent
 Summary:        Guice parent POM
 
-%description -n guice-parent
+%description -n %{short_name}-parent
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides parent POM for Guice modules.
 
-%package -n guice-assistedinject
+%package -n %{short_name}-assistedinject
 Summary:        AssistedInject extension module for Guice
 
-%description -n guice-assistedinject
+%description -n %{short_name}-assistedinject
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides AssistedInject module for Guice.
 
-%package -n guice-extensions
+%package -n %{short_name}-extensions
 Summary:        Extensions for Guice
 
-%description -n guice-extensions
+%description -n %{short_name}-extensions
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides extensions POM for Guice.
 
-%package -n guice-grapher
+%package -n %{short_name}-grapher
 Summary:        Grapher extension module for Guice
 
-%description -n guice-grapher
+%description -n %{short_name}-grapher
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Grapher module for Guice.
 
-%package -n guice-jmx
+%package -n %{short_name}-jmx
 Summary:        JMX extension module for Guice
 
-%description -n guice-jmx
+%description -n %{short_name}-jmx
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides JMX module for Guice.
 
-%package -n guice-jndi
+%package -n %{short_name}-jndi
 Summary:        JNDI extension module for Guice
 
-%description -n guice-jndi
+%description -n %{short_name}-jndi
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides JNDI module for Guice.
 
-%package -n guice-multibindings
+%package -n %{short_name}-multibindings
 Summary:        MultiBindings extension module for Guice
 
-%description -n guice-multibindings
+%description -n %{short_name}-multibindings
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides MultiBindings module for Guice.
 
+%if %{with jpa}
+%package -n %{short_name}-persist
+Summary:        Persist extension module for Guice
 
-%package -n guice-servlet
+%description -n %{short_name}-persist
+Guice is a lightweight dependency injection framework for Java 5
+and above. This package provides Persist module for Guice.
+%endif
+
+%package -n %{short_name}-servlet
 Summary:        Servlet extension module for Guice
 
-%description -n guice-servlet
+%description -n %{short_name}-servlet
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Servlet module for Guice.
 
+%if %{with spring}
+%package -n %{short_name}-spring
+Summary:        Spring extension module for Guice
 
-%package -n guice-throwingproviders
+%description -n %{short_name}-spring
+Guice is a lightweight dependency injection framework for Java 5
+and above. This package provides Spring module for Guice.
+%endif
+
+%package -n %{short_name}-testlib
+Summary:        TestLib extension module for Guice
+
+%description -n %{short_name}-testlib
+Guice is a lightweight dependency injection framework for Java 5
+and above. This package provides TestLib module for Guice.
+
+%package -n %{short_name}-throwingproviders
 Summary:        ThrowingProviders extension module for Guice
 
-%description -n guice-throwingproviders
+%description -n %{short_name}-throwingproviders
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides ThrowingProviders module for Guice.
 
-%package -n guice-bom
+%package -n %{short_name}-bom
 Summary:        Bill of Materials for Guice
 
-%description -n guice-bom
+%description -n %{short_name}-bom
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Bill of Materials module for Guice.
 
-%{?module_package}
+%package javadoc
-%{?javadoc_package}
+Summary:        API documentation for Guice
+
+%description javadoc
+This package provides %{summary}.
+
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 # We don't have struts2 in Fedora yet.
 %pom_disable_module struts2 extensions
@@ -155,24 +204,22 @@ and above. This package provides Bill of Materials module for Guice.
 %pom_remove_parent
 %pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests
 
+%if %{without jpa}
 %pom_disable_module persist extensions
+%endif
+%if %{without spring}
 %pom_disable_module spring extensions
+%endif
 
 %pom_disable_module jdk8-tests
 
-# Require a newer compiler
-%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8"
-%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8"
-
-%pom_disable_module testlib extensions
-
 %build
 %mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:"
 
 %mvn_package :::no_aop: guice
 
-%mvn_file  ":guice-{*}"  guice/guice-@1
+%mvn_file  ":guice-{*}"  %{short_name}/guice-@1
-%mvn_file  ":guice" guice/%{name} %{name}
+%mvn_file  ":guice" %{short_name}/%{name} %{name}
 %mvn_alias ":guice" "org.sonatype.sisu:sisu-guice"
 # Skip tests because of missing dependency guice-testlib
 %mvn_build -f -s
@@ -180,36 +227,35 @@ and above. This package provides Bill of Materials module for Guice.
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles-guice
+%files -f .mfiles-guice
+%dir %{_javadir}/%{short_name}
 
-%files -n guice-parent -f .mfiles-guice-parent
+%files -n %{short_name}-parent -f .mfiles-guice-parent
-%license COPYING
+%doc COPYING
 
-%files -n guice-assistedinject -f .mfiles-guice-assistedinject
+%files -n %{short_name}-assistedinject -f .mfiles-guice-assistedinject
-%files -n guice-extensions -f .mfiles-extensions-parent
+%files -n %{short_name}-extensions -f .mfiles-extensions-parent
-%files -n guice-grapher -f .mfiles-guice-grapher
+%files -n %{short_name}-grapher -f .mfiles-guice-grapher
-%files -n guice-jmx -f .mfiles-guice-jmx
+%files -n %{short_name}-jmx -f .mfiles-guice-jmx
-%files -n guice-jndi -f .mfiles-guice-jndi
+%files -n %{short_name}-jndi -f .mfiles-guice-jndi
-%files -n guice-multibindings -f .mfiles-guice-multibindings
+%files -n %{short_name}-multibindings -f .mfiles-guice-multibindings
-%files -n guice-servlet -f .mfiles-guice-servlet
+%if %{with jpa}
-%files -n guice-throwingproviders -f .mfiles-guice-throwingproviders
+%files -n %{short_name}-persist -f .mfiles-guice-persist
+%endif
+%files -n %{short_name}-servlet -f .mfiles-guice-servlet
+%if %{with spring}
+%files -n %{short_name}-spring -f .mfiles-guice-spring
+%endif
+%files -n %{short_name}-testlib -f .mfiles-guice-testlib
+%files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders
+
+%files -n %{short_name}-bom -f .mfiles-guice-bom
+
+%files javadoc -f .mfiles-javadoc
+%doc COPYING
 
-%files -n guice-bom -f .mfiles-guice-bom
 
 %changelog
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-4
-- Build with OpenJDK 8
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-3
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-2
-- Mass rebuild for javapackages-tools 201901
-
-* Fri Apr 05 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.2-1
-- Update to upstream version 4.2.2
-- Fixes: RHBZ #1563661
-
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-11
 - Remove legacy Provides