- Cleanup - New guidelines - felix-parent has many unnecessary Requires, RHBZ#969299
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This commit is contained in:
Marek Goldmann
Mikolaj Izdebski
parent
1b1f974746
commit
294dbcf896
@ -1,29 +0,0 @@
|
||||
--- pom.xml.sav 2009-09-22 10:16:43.000000000 +0300
|
||||
+++ pom.xml 2011-03-30 10:09:03.907508489 +0300
|
||||
@@ -202,12 +202,6 @@
|
||||
<version>2.4</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.mockito</groupId>
|
||||
- <artifactId>mockito-all</artifactId>
|
||||
- <version>1.7</version>
|
||||
- <scope>test</scope>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<pluginManagement>
|
||||
@@ -302,13 +296,6 @@
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-compiler-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <target>1.3</target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
@ -1,14 +0,0 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymock</artifactId>
|
||||
<version>2.4</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP</groupId>
|
||||
<artifactId>easymock2</artifactId>
|
||||
<version>2.5.2</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@ -1,6 +1,6 @@
|
||||
Name: felix-parent
|
||||
Version: 1.2.1
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
Summary: Parent POM file for Apache Felix Specs
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -9,98 +9,33 @@ URL: http://felix.apache.org/
|
||||
#svn export http://svn.apache.org/repos/asf/felix/releases/felix-parent-1.2.1/
|
||||
#tar -jcf felix-parent-1.2.1.tar.bz2 felix-parent-1.2.1/
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-depmap.xml
|
||||
#Remove mockito-all dependency which is not in koji
|
||||
Patch0: %{name}-%{version}-pom.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: junit
|
||||
BuildRequires: mockito
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: easymock2
|
||||
BuildRequires: maven-plugin-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: maven-assembly-plugin
|
||||
BuildRequires: maven-source-plugin
|
||||
BuildRequires: maven-deploy-plugin
|
||||
BuildRequires: maven-gpg-plugin
|
||||
BuildRequires: maven-project-info-reports-plugin
|
||||
BuildRequires: maven-release-plugin
|
||||
BuildRequires: maven-surefire-plugin
|
||||
BuildRequires: maven-surefire-report-plugin
|
||||
BuildRequires: maven-plugin-build-helper
|
||||
BuildRequires: maven-plugin-jxr
|
||||
|
||||
Requires: junit
|
||||
Requires: easymock2
|
||||
Requires: maven
|
||||
Requires: maven-plugin-plugin
|
||||
Requires: maven-compiler-plugin
|
||||
Requires: maven-install-plugin
|
||||
Requires: maven-jar-plugin
|
||||
Requires: maven-javadoc-plugin
|
||||
Requires: maven-resources-plugin
|
||||
Requires: maven-assembly-plugin
|
||||
Requires: maven-source-plugin
|
||||
Requires: maven-deploy-plugin
|
||||
Requires: maven-gpg-plugin
|
||||
Requires: maven-project-info-reports-plugin
|
||||
Requires: maven-release-plugin
|
||||
Requires: maven-surefire-plugin
|
||||
Requires: maven-surefire-report-plugin
|
||||
Requires: maven-plugin-build-helper
|
||||
Requires: maven-plugin-jxr
|
||||
|
||||
Requires: jpackage-utils
|
||||
Requires(post): jpackage-utils
|
||||
Requires(postun): jpackage-utils
|
||||
|
||||
|
||||
%description
|
||||
Parent POM file for Apache Felix Specs.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0 -b .sav
|
||||
|
||||
%pom_remove_plugin org.apache.maven.plugins:maven-site-plugin
|
||||
|
||||
%build
|
||||
mvn-rpmbuild \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
|
||||
install javadoc:javadoc
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
# depmap
|
||||
%add_to_maven_depmap org.apache.felix %{name} %{version} JPP/felix %{name}
|
||||
%mvn_install
|
||||
|
||||
# legacy depmap
|
||||
# (some upstream packages haven't caught up with the "felix" -> "felix-parent" rename yet)
|
||||
%add_to_maven_depmap org.apache.felix felix %{version} JPP/felix %{name}
|
||||
|
||||
# poms
|
||||
install -pD -T -m 644 pom.xml \
|
||||
%{buildroot}%{_mavenpomdir}/JPP.felix-%{name}.pom
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
%postun
|
||||
%update_maven_depmap
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%files -f .mfiles
|
||||
%doc LICENSE NOTICE
|
||||
%{_mavenpomdir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri May 31 2013 Marek Goldmann <mgoldman@redhat.com>
|
||||
- Cleanup
|
||||
- New guidelines
|
||||
- felix-parent has many unnecessary Requires, RHBZ#969299
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user