[spice-parent] Fix build requires and requires (#884632)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Dec 6 13:15:25 UTC 2012
commit 1d0dc29bff8dbf6ae3b4900df1f83fd4900d4f64
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu Dec 6 14:14:41 2012 +0100
Fix build requires and requires (#884632)
- Cleanup specfile for latest guidelines
- Add ASL license text
.gitignore | 1 +
sources | 1 +
spice-parent.spec | 46 ++++++++++++++++++++++------------------------
3 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cd0534..763042e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
spice-parent-15.tar.gz
+/LICENSE-2.0.txt
diff --git a/sources b/sources
index e432653..ea74318 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
adb33abd8fefcc76f6236569f8bb5cd2 spice-parent-15.tar.gz
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
diff --git a/spice-parent.spec b/spice-parent.spec
index e532a9b..5f2e2ad 100644
--- a/spice-parent.spec
+++ b/spice-parent.spec
@@ -1,6 +1,6 @@
Name: spice-parent
Version: 15
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Sonatype Spice Components
Group: Development/Libraries
@@ -9,54 +9,52 @@ URL: http://svn.sonatype.org/spice/tags/spice-parent-15
#svn export http://svn.sonatype.org/spice/tags/spice-parent-15 spice-parent-15
#tar zcf spice-parent-15.tar.gz spice-parent-15/
Source0: %{name}-%{version}.tar.gz
-Patch0: pom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1: http://apache.org/licenses/LICENSE-2.0.txt
+Patch0: pom.patch
BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires: jpackage-utils
+BuildRequires: maven
+BuildRequires: forge-parent
Requires: jpackage-utils
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
+Requires: forge-parent
%description
-Spice components and libraries are common components
+Spice components and libraries are common components
used throughout the Sonatype Forge.
%prep
%setup -q -n %{name}-%{version}
#Remove plexus-javadoc
%patch0
+cp %{SOURCE1} .
%build
#nothing to do for the pom
%install
-rm -rf %{buildroot}
-
-%add_to_maven_depmap org.sonatype.spice spice-parent %{version} JPP spice-parent
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%post
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom
-%postun
-%update_maven_depmap
+%check
+mvn-rpmbuild verify
-%clean
-rm -rf %{buildroot}
+%files -f .mfiles
+%doc LICENSE-2.0.txt
-%files
-%defattr(-,root,root,-)
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
%changelog
+* Thu Dec 6 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 15-7
+- Fix build requires and requires (#884632)
+- Cleanup specfile for latest guidelines
+- Add ASL license text
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -67,11 +65,11 @@ rm -rf %{buildroot}
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Sep 09 2010 Hui Wang <huwang at redhat.com> - 15-3
-- Add pom.patch
+- Add pom.patch
* Fri May 14 2010 Hui Wang <huwang at redhat.com> - 15-2
- Add instruction which create Source0 as a commont
-- Use macros in Source0
+- Use macros in Source0
* Tue May 11 2010 Hui Wang <huwang at redhat.com> - 15-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
More information about the scm-commits
mailing list