mizdebsk pushed to jetty-build-support (master). "Cleanup spec file"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 03:30:39 UTC 2015


>From f3d12525b229d5c8e772e0b9c8af6bdeece545a6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 14 Apr 2015 05:29:49 +0200
Subject: Cleanup spec file


diff --git a/jetty-build-support.spec b/jetty-build-support.spec
index a86f475..ae81679 100644
--- a/jetty-build-support.spec
+++ b/jetty-build-support.spec
@@ -1,26 +1,26 @@
 Name:           jetty-build-support
 Version:        1.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Jetty build support files
-
 # licensing bug upstream
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=362646
 # - commit stating the license is already there
 License:        ASL 2.0 or EPL
 URL:            http://www.eclipse.org/jetty/
-Source0:        http://git.eclipse.org/c/jetty/org.eclipse.jetty.toolchain.git/snapshot/%{name}-%{version}.tar.bz2
-# rpmlint config file (fedpkg lint will use this)
-#Source1:        .rpmlint
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
+Source0:        http://git.eclipse.org/c/jetty/org.eclipse.jetty.toolchain.git/snapshot/%{name}-%{version}.tar.bz2
+
 BuildRequires:  maven-local
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-source-plugin
-BuildRequires:  maven-enforcer-api
-BuildRequires:  jetty-toolchain
-BuildRequires:  junit
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.maven.enforcer:enforcer-api)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-toolchain:pom:)
 
 %description
 Build Support for Jetty. Contains enforcer rules, PMD rulesets, etc.
@@ -31,25 +31,25 @@ Summary:        API documentation for %{name}
 %description    javadoc
 %{summary}.
 
-
 %prep
 %setup -q
 
 %build
-pushd %{name}
-%mvn_build
+%mvn_build -- -f %{name}
 
 %install
-pushd %{name}
 %mvn_install
 
-%files -f %{name}/.mfiles
+%files -f .mfiles
 %doc jetty-distribution-remote-resources/src/main/resources/*
 
-%files javadoc -f %{name}/.mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
 %doc jetty-distribution-remote-resources/src/main/resources/*
 
 %changelog
+* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-14
+- Cleanup spec file
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jetty-build-support.git/commit/?h=master&id=f3d12525b229d5c8e772e0b9c8af6bdeece545a6


More information about the scm-commits mailing list