mizdebsk pushed to felix-gogo-shell (master). "Cleanup spec file"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 03:59:35 UTC 2015
>From 25038ff6360e855efebc19d1bb9904816695212f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 14 Apr 2015 05:55:37 +0200
Subject: Cleanup spec file
diff --git a/felix-gogo-shell.spec b/felix-gogo-shell.spec
index e5f4519..d3c0740 100644
--- a/felix-gogo-shell.spec
+++ b/felix-gogo-shell.spec
@@ -1,42 +1,26 @@
-%global project felix
-%global bundle org.apache.felix.gogo.shell
-
-%{!?scl:%global pkg_name %{name}}
-%{?scl:%scl_package %{project}-gogo-shell}
-
-Name: %{?scl_prefix}%{project}-gogo-shell
-Version: 0.10.0
-Release: 13%{?dist}
-Summary: Community OSGi R4 Service Platform Implementation - Basic Commands
-Group: Development/Tools
-License: ASL 2.0
-URL: http://felix.apache.org/site/apache-felix-gogo.html
-
-Source0: http://mirror.catn.com/pub/apache//felix/org.apache.felix.gogo.shell-0.10.0-project.tar.gz
+Name: felix-gogo-shell
+Version: 0.10.0
+Release: 14%{?dist}
+Summary: Community OSGi R4 Service Platform Implementation - Basic Commands
+License: ASL 2.0
+URL: http://felix.apache.org/site/apache-felix-gogo.html
+BuildArch: noarch
+
+Source0: http://mirror.catn.com/pub/apache//felix/org.apache.felix.gogo.shell-0.10.0-project.tar.gz
# Changed GroupID from osgi to felix
-Patch0: %{pkg_name}-groupid.patch
-
-Patch1: ignoreActivatorException.patch
+Patch0: %{name}-groupid.patch
-BuildArch: noarch
+Patch1: ignoreActivatorException.patch
-BuildRequires: java-devel >= 1.7.0
-BuildRequires: jpackage-utils
-BuildRequires: maven-local
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: %{?scl_prefix}felix-gogo-parent
-BuildRequires: %{?scl_prefix}felix-gogo-runtime
-BuildRequires: felix-osgi-compendium
-BuildRequires: maven-install-plugin
-BuildRequires: mockito
-
-%{?scl:BuildRequires: %{?scl_prefix}build}
-
-Requires: java-headless
-Requires: jpackage-utils
-%{?scl:Requires: %scl_runtime}
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.felix:gogo-parent:pom:)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.felix:org.apache.felix.gogo.runtime)
+BuildRequires: mvn(org.apache.felix:org.osgi.compendium)
+BuildRequires: mvn(org.apache.felix:org.osgi.core)
+BuildRequires: mvn(org.easymock:easymock)
+BuildRequires: mvn(org.mockito:mockito-all)
%description
Apache Felix is a community effort to implement the OSGi R4 Service Platform
@@ -48,14 +32,13 @@ OSGi technology combines aspects of these aforementioned principles to define a
dynamic service deployment framework that is amenable to remote management.
%package javadoc
-Group: Documentation
-Summary: Javadoc for %{pkg_name}
+Summary: Javadoc for %{pkg_name}
%description javadoc
This package contains the API documentation for %{pkg_name}.
%prep
-%setup -q -n %{bundle}-%{version}
+%setup -q -n org.apache.felix.gogo.shell-%{version}
%patch0 -p1 -F3
%patch1
@@ -66,13 +49,15 @@ This package contains the API documentation for %{pkg_name}.
%mvn_install
%files -f .mfiles
-%dir %{_javadir}/%{name}
-%doc DEPENDENCIES LICENSE NOTICE
+%license LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE NOTICE
%changelog
+* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10.0-14
+- Cleanup spec file
+
* Wed Jul 16 2014 Mat Booth <mat.booth at redhat.com> - 0.10.0-13
- Fix unowned directory.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/felix-gogo-shell.git/commit/?h=master&id=25038ff6360e855efebc19d1bb9904816695212f
More information about the scm-commits
mailing list