From fbefb4ccacdbf842c90d208a32da10d25c61c893 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 13:46:12 +0200
Subject: [PATCH] Expand %short_name macro

---
 google-guice.spec | 73 +++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/google-guice.spec b/google-guice.spec
index d737274..eb56eec 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -1,12 +1,9 @@
-
-%global short_name guice
-
-Name:           google-%{short_name}
+Name:           google-guice
 Version:        4.2.2
 Release:        2%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
 License:        ASL 2.0
-URL:            https://github.com/google/%{short_name}
+URL:            https://github.com/google/guice
 BuildArch:      noarch
 
 # ./create-tarball.sh %%{version}
@@ -49,75 +46,75 @@ 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 %{short_name}-parent
+%package -n guice-parent
 Summary:        Guice parent POM
 
-%description -n %{short_name}-parent
+%description -n guice-parent
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides parent POM for Guice modules.
 
-%package -n %{short_name}-assistedinject
+%package -n guice-assistedinject
 Summary:        AssistedInject extension module for Guice
 
-%description -n %{short_name}-assistedinject
+%description -n guice-assistedinject
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides AssistedInject module for Guice.
 
-%package -n %{short_name}-extensions
+%package -n guice-extensions
 Summary:        Extensions for Guice
 
-%description -n %{short_name}-extensions
+%description -n guice-extensions
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides extensions POM for Guice.
 
-%package -n %{short_name}-grapher
+%package -n guice-grapher
 Summary:        Grapher extension module for Guice
 
-%description -n %{short_name}-grapher
+%description -n guice-grapher
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Grapher module for Guice.
 
-%package -n %{short_name}-jmx
+%package -n guice-jmx
 Summary:        JMX extension module for Guice
 
-%description -n %{short_name}-jmx
+%description -n guice-jmx
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides JMX module for Guice.
 
-%package -n %{short_name}-jndi
+%package -n guice-jndi
 Summary:        JNDI extension module for Guice
 
-%description -n %{short_name}-jndi
+%description -n guice-jndi
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides JNDI module for Guice.
 
-%package -n %{short_name}-multibindings
+%package -n guice-multibindings
 Summary:        MultiBindings extension module for Guice
 
-%description -n %{short_name}-multibindings
+%description -n guice-multibindings
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides MultiBindings module for Guice.
 
 
-%package -n %{short_name}-servlet
+%package -n guice-servlet
 Summary:        Servlet extension module for Guice
 
-%description -n %{short_name}-servlet
+%description -n guice-servlet
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Servlet module for Guice.
 
 
-%package -n %{short_name}-throwingproviders
+%package -n guice-throwingproviders
 Summary:        ThrowingProviders extension module for Guice
 
-%description -n %{short_name}-throwingproviders
+%description -n guice-throwingproviders
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides ThrowingProviders module for Guice.
 
-%package -n %{short_name}-bom
+%package -n guice-bom
 Summary:        Bill of Materials for Guice
 
-%description -n %{short_name}-bom
+%description -n guice-bom
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Bill of Materials module for Guice.
 
@@ -177,8 +174,8 @@ This package provides %{summary}.
 
 %mvn_package :::no_aop: guice
 
-%mvn_file  ":guice-{*}"  %{short_name}/guice-@1
-%mvn_file  ":guice" %{short_name}/%{name} %{name}
+%mvn_file  ":guice-{*}"  guice/guice-@1
+%mvn_file  ":guice" guice/%{name} %{name}
 %mvn_alias ":guice" "org.sonatype.sisu:sisu-guice"
 # Skip tests because of missing dependency guice-testlib
 %mvn_build -f -s
@@ -187,21 +184,21 @@ This package provides %{summary}.
 %mvn_install
 
 %files -f .mfiles-guice
-%dir %{_javadir}/%{short_name}
+%dir %{_javadir}/guice
 
-%files -n %{short_name}-parent -f .mfiles-guice-parent
+%files -n guice-parent -f .mfiles-guice-parent
 %doc COPYING
 
-%files -n %{short_name}-assistedinject -f .mfiles-guice-assistedinject
-%files -n %{short_name}-extensions -f .mfiles-extensions-parent
-%files -n %{short_name}-grapher -f .mfiles-guice-grapher
-%files -n %{short_name}-jmx -f .mfiles-guice-jmx
-%files -n %{short_name}-jndi -f .mfiles-guice-jndi
-%files -n %{short_name}-multibindings -f .mfiles-guice-multibindings
-%files -n %{short_name}-servlet -f .mfiles-guice-servlet
-%files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders
+%files -n guice-assistedinject -f .mfiles-guice-assistedinject
+%files -n guice-extensions -f .mfiles-extensions-parent
+%files -n guice-grapher -f .mfiles-guice-grapher
+%files -n guice-jmx -f .mfiles-guice-jmx
+%files -n guice-jndi -f .mfiles-guice-jndi
+%files -n guice-multibindings -f .mfiles-guice-multibindings
+%files -n guice-servlet -f .mfiles-guice-servlet
+%files -n guice-throwingproviders -f .mfiles-guice-throwingproviders
 
-%files -n %{short_name}-bom -f .mfiles-guice-bom
+%files -n guice-bom -f .mfiles-guice-bom
 
 %files javadoc -f .mfiles-javadoc
 %doc COPYING