mizdebsk pushed to apache-resource-bundles (master). "Cleanup spec file"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 03:44:32 UTC 2015
>From 2c6403c17b81ab950f68c7b50a9887b0cc7ee0e2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 14 Apr 2015 05:44:18 +0200
Subject: Cleanup spec file
diff --git a/apache-resource-bundles.spec b/apache-resource-bundles.spec
index 70ba59f..b17abc2 100644
--- a/apache-resource-bundles.spec
+++ b/apache-resource-bundles.spec
@@ -2,46 +2,39 @@
%global lh_version 1.1
%global id_version 1.1
-Name: apache-resource-bundles
-Version: 2
-Release: 14%{?dist}
-Summary: Apache Resource Bundles
-
-Group: Development/Libraries
-License: ASL 2.0
-URL: http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
-Source0: http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
-Source1: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
-Source2: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
-Source3: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
-Source4: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
-Source5: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
-Source6: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
-
-BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-remote-resources-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-site-plugin
-
-BuildArch: noarch
+Name: apache-resource-bundles
+Version: 2
+Release: 15%{?dist}
+Summary: Apache Resource Bundles
+License: ASL 2.0
+URL: http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
+BuildArch: noarch
+
+Source0: http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
+Source1: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
+Source2: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
+Source3: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
+Source4: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
+Source5: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
+Source6: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
+
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
%description
An archive which contains templates for generating the necessary license files
and notices for all Apache releases.
%prep
-%setup -c -T
-cp %SOURCE0 ./pom.xml
+%setup -cT
+cp -p %{SOURCE0} ./pom.xml
# jar
mkdir -p apache-jar-resource-bundle
pushd apache-jar-resource-bundle
-jar xvf %SOURCE1
-cp %SOURCE2 ./pom.xml
+jar xvf %{SOURCE1}
+cp -p %{SOURCE2} ./pom.xml
mkdir -p src/main/resources
mv META-INF src/main/resources
popd
@@ -49,8 +42,8 @@ popd
# license-header
mkdir -p apache-license-header-resource-bundle
pushd apache-license-header-resource-bundle
-jar xvf %SOURCE3
-cp %SOURCE4 ./pom.xml
+jar xvf %{SOURCE3}
+cp -p %{SOURCE4} ./pom.xml
mkdir -p src/main/resources
mv META-INF src/main/resources
popd
@@ -58,26 +51,28 @@ popd
# incubator-disclaimer
mkdir -p apache-incubator-disclaimer-resource-bundle
pushd apache-incubator-disclaimer-resource-bundle
-jar xvf %SOURCE5
-cp %SOURCE6 ./pom.xml
+jar xvf %{SOURCE5}
+cp -p %{SOURCE6} ./pom.xml
mkdir -p src/main/resources
mv META-INF src/main/resources
popd
-
-%build
%mvn_file :apache-jar-resource-bundle apache-resource-bundles/jar
%mvn_file :apache-license-header-resource-bundle apache-resource-bundles/license-header
%mvn_file :apache-incubator-disclaimer-resource-bundle apache-resource-bundles/incubator-disclaimer
+
+%build
%mvn_build
%install
%mvn_install
%files -f .mfiles
-%dir %{_javadir}/%{name}
%changelog
+* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2-15
+- Cleanup spec file
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/apache-resource-bundles.git/commit/?h=master&id=2c6403c17b81ab950f68c7b50a9887b0cc7ee0e2
More information about the scm-commits
mailing list