rpms/netbeans/devel netbeans-6.1-70-updatecenters.patch, NONE, 1.1 netbeans.spec, 1.4, 1.5

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3534

Modified Files:
	netbeans.spec 
Added Files:
	netbeans-6.1-70-updatecenters.patch 
Log Message:
Fixing the bug #466179


netbeans-6.1-70-updatecenters.patch:

--- NEW FILE netbeans-6.1-70-updatecenters.patch ---
diff -Nur netbeans-6.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2008-06-24 16:17:06.000000000 +0400
+++ netbeans-6.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2008-10-13 14:03:56.000000000 +0400
@@ -51,8 +51,10 @@
 Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
 Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins
 Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal
+Services/AutoupdateType/standard-update-provider-fedora.instance=NetBeans for Fedora
 #NOI18N
 URL_Standard=http://updates.netbeans.org/netbeans/updates/6.1/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
 URL_Beta=http://updates.netbeans.org/netbeans/updates/6.1/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
 URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.1/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
 URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.1/catalog.xml.gz
+URL_Standard_Fedora=http://updates.netbeans.org/netbeans/updates/6.1/uc/final/fedora/catalog.xml.gz?{$netbeans.hash.code}
diff -Nur netbeans-6.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2008-06-24 16:17:06.000000000 +0400
+++ netbeans-6.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2008-10-13 14:27:37.000000000 +0400
@@ -53,7 +53,7 @@
         <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
         <attr name="url_key" stringvalue="URL_Standard"/>
         <attr name="category" stringvalue="STANDARD"/>
-        <attr name="enabled" boolvalue="true"/>
+        <attr name="enabled" boolvalue="false"/>
         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
       </file>
@@ -87,7 +87,17 @@
         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
       </file>
-      
+
+      <file name="standard-update-provider-fedora.instance">
+        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.updatecenters.resources.Bundle"/>
+        <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+        <attr name="url_key" stringvalue="URL_Standard_Fedora"/>
+        <attr name="category" stringvalue="STANDARD"/>
+        <attr name="enabled" boolvalue="true"/>
+        <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
+        <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
+      </file>
+
    </folder>
     
   </folder> <!-- Services -->


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netbeans.spec	7 Oct 2008 13:31:59 -0000	1.4
+++ netbeans.spec	13 Oct 2008 12:31:10 -0000	1.5
@@ -51,7 +51,6 @@
 # %1 the directory has been prevented for autoupdate.
 %define rm_noautoupdate() %{__rm} -rf %1/.noautoupdate
 
-
 %define cluster basic
 
 %define nb_icon         %{nb_nb_dir}/netbeans.png
@@ -74,15 +73,15 @@
 %define xml_resolver_ver %{nb_ver}
 %define xml_resolver_jar %{_javadir}/%{xml_resolver}-%{xml_resolver_ver}.jar
 
-# Used netbeans-svnclientadapter-6.1.jar
+# Used svn client adapter
 %define svnclientadapter     netbeans-svnclientadapter
 %define svnclientadapter_ver %{nb_ver}
 %define svnclientadapter_jar %{_javadir}/%{svnclientadapter}-%{svnclientadapter_ver}.jar
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        7%{?dist}
-Summary:        Integrated Development Environment (IDE)
+Release:        8%{?dist}
+Summary:        NetBeans Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
 Vendor:         netbeans.org
@@ -101,6 +100,8 @@
 Patch4: %{name}-%{version}-40-build-xml.patch
 Patch5: %{name}-%{version}-50-ide-launcher.patch
 Patch6: %{name}-%{version}-60-small-ide-config.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=466179
+Patch7: %{name}-%{version}-70-updatecenters.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -115,7 +116,6 @@
 BuildRequires: junit4 >= 0:4.3.1
 BuildRequires: swing-layout >= 0:1.0
 BuildRequires: javahelp2 >= 2.0.05
-# BuildRequires: jna >= 0:3.0.2 It is provided by nb_platform
 BuildRequires: %{nb_platform_pkg} >= %{version}
 BuildRequires: lucene >= 0:2.3.0
 BuildRequires: unzip
@@ -132,9 +132,6 @@
 
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
-# Requires: swing-layout >= 0:1.0
-# Requires: javahelp2 >= 2.0.05 It is provided by nb_platform
-# Requires: jna >= 0:3.0.2 It is provided by nb_platform
 Requires: %{nb_apisupport_pkg} >= %{version}
 Requires: %{nb_harness_pkg}    >= %{version}
 Requires: %{nb_ide_pkg}        >= %{version}
@@ -242,6 +239,7 @@
 %patch4 -p1 -b .sav
 %patch5 -p1 -b .sav
 %patch6 -p1 -b .sav
+%patch7 -p1 -b .sav
 
 %build
 
@@ -459,6 +457,10 @@
 %doc nbbuild/standard-nbm-license.txt
 
 %changelog
+* Thu Oct 09 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-8
+- Update center - NetBeans is disabled, update center - NetBeans for Fedora is added (#466179)
+- Some cosmetics
+
 * Tue Oct 07 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-7
 - Dependency upon java-sdk is added instead of java-1.6.0-openjdk (#464558, # 465891)