[netbeans-platform] Use versioned packages for provides and directory names

Omair Majid omajid at fedoraproject.org
Tue Nov 8 15:53:21 UTC 2011


commit 573ae835d4d3ed4347eedafc14b257c46ff317e6
Author: Omair Majid <omajid at redhat.com>
Date:   Tue Nov 8 10:52:41 2011 -0500

    Use versioned packages for provides and directory names

 netbeans-platform.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/netbeans-platform.spec b/netbeans-platform.spec
index e55eead..164c34d 100644
--- a/netbeans-platform.spec
+++ b/netbeans-platform.spec
@@ -10,11 +10,15 @@
 %define nb_home         %{_datadir}/%{nb_}
 %define nb_dir          %{nb_home}/%{nb_major_ver}
 
-%define nb_platform     platform
-%define nb_platform_dir %{nb_home}/%{nb_platform}
+%define nb_platform_ver  13
+%define nb_platform      platform
+%define nb_platform_dir  %{nb_home}/%{nb_platform}%{nb_platform_ver}
+%define nb_platform_pkg  %{nb_}-platform
+%define nb_platform_vpkg %{nb_}-%{nb_platform}%{nb_platform_ver}
 
 %define nb_harness      harness
 %define nb_harness_dir  %{nb_home}/%{nb_harness}
+%define nb_harness_vpkg %{nb_}-%{nb_harness}
 
 %define nb_javadoc      javadoc
 %define nb_javadoc_dir  %{_javadocdir}/%{nb_}-%{nb_platform}
@@ -63,7 +67,7 @@
 Name:         netbeans-platform
 Epoch:        1
 Version:      %{nb_ver}
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      NetBeans Platform
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
@@ -125,6 +129,8 @@ Requires: felix-osgi-compendium >= 1.4.0
 Requires: felix-main >= 2.0.5
 Requires: felix-framework >= 2.0.5
 
+Provides: %{nb_platform_vpkg} = %{epoch}:%{version}-%{release}
+
 %description
 The NetBeans Platform is a generic framework for Swing applications.
 It provides the services common to almost all large desktop
@@ -157,6 +163,8 @@ Requires: jakarta-oro >= 2.0.8
 Requires: javahelp2 >= 2.0.05
 Requires: jemmy >= 2.3.0.0
 
+Provides:  %{nb_harness_vpkg} = %{epoch}:%{version}-%{release}
+
 %description %{nb_harness}
 Harness with build scripts and ant tasks for everyone who
 build an application on top of NetBeans Platform
@@ -343,6 +351,10 @@ popd
 %doc nbbuild/licenses/CDDL-GPL-2-CP
 
 %changelog
+* Tue Nov 08 2011 Omair Majid <omajid at redhat.com> - 1:7.0.1-2
+- Add versioned provides for netbeans-platform and harness
+- Use versioned directory names
+
 * Tue Oct 18 2011 Omair Majid <omajid at redhat.com> - 1:7.0.1-1
 - Update to 7.0.1
 - Build with the default jdk


More information about the scm-commits mailing list