rpms/netbeans/F-10 netbeans-ide.desktop-template, 1.1, 1.2 netbeans.spec, 1.6, 1.7

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11903

Modified Files:
	netbeans-ide.desktop-template netbeans.spec 
Log Message:
Bug https://bugzilla.redhat.com/show_bug.cgi?id=472825 and other minor issues are fixed.



Index: netbeans-ide.desktop-template
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/F-10/netbeans-ide.desktop-template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-ide.desktop-template	10 Sep 2008 00:38:06 -0000	1.1
+++ netbeans-ide.desktop-template	1 Dec 2008 11:29:25 -0000	1.2
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Version=1.0
 Name=NetBeans IDE <nb_ver>


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/F-10/netbeans.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- netbeans.spec	22 Oct 2008 15:08:43 -0000	1.6
+++ netbeans.spec	1 Dec 2008 11:29:25 -0000	1.7
@@ -1,3 +1,6 @@
+# Prevent brp-java-repack-jars from being run.
+%define __jar_repack %{nil}
+
 %define __alternatives %{_sbindir}/alternatives
 
 %define nb_              netbeans
@@ -80,8 +83,8 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        9%{?dist}
-Summary:        NetBeans Integrated Development Environment (IDE)
+Release:        10%{?dist}
+Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
 Vendor:         netbeans.org
@@ -132,6 +135,7 @@
 BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
 BuildRequires: ini4j >= 0.3.2-4
 BuildRequires: netbeans-svnclientadapter >= %{version}
+BuildRequires: jakarta-commons-logging >= 1.0.4
 
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
@@ -183,6 +187,7 @@
 Requires: freemarker >= 2.3.8
 Requires: xerces-j2 >= 2.7.1
 Requires: netbeans-svnclientadapter >= %{version}
+Requires: jakarta-commons-logging >= 1.0.4
 Provides: libnb-%{nb_ide} = %{version}
 
 %description %{nb_ide}
@@ -460,6 +465,12 @@
 %doc nbbuild/standard-nbm-license.txt
 
 %changelog
+* Tue Nov 25 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-10
+- Explicit dependencies on the jakarta-commons-logging package are added (#472825).
+- Summary is fixed according to the request of the Richard Hughes <hughsient at gmail.com>.
+- Call of the brp-java-repack-jars script is disabled.
+- The deprecated key "Encoding" is removed from the desktop file template.
+
 * Wed Oct 22 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-9
 - Unset the DESKTOP_STARTUP_ID environment variable (#467546). The netbeans-6.1-50-ide-launcher.patch is modified.