rpms/system-switch-java/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 system-switch-java.spec, 1.1, 1.2

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/extras/rpms/system-switch-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22151

Modified Files:
	.cvsignore sources system-switch-java.spec 
Log Message:
* Tue Jun 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-1
- Import system-switch-java 1.1.0.
- Merge gui subpackage into base package.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-java/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jan 2007 21:51:34 -0000	1.2
+++ .cvsignore	27 Jun 2007 23:11:27 -0000	1.3
@@ -1 +1 @@
-system-switch-java-1.0.0.tar.bz2
+system-switch-java-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-java/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jan 2007 21:51:34 -0000	1.2
+++ sources	27 Jun 2007 23:11:27 -0000	1.3
@@ -1 +1 @@
-9403b60da2e2bd3117f170d75a507ad3  system-switch-java-1.0.0.tar.bz2
+c6608498dfb9c239fdc4b6deffd50a9a  system-switch-java-1.1.0.tar.gz


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-switch-java.spec	24 Jan 2007 21:59:31 -0000	1.1
+++ system-switch-java.spec	27 Jun 2007 23:11:27 -0000	1.2
@@ -1,12 +1,12 @@
 Name: system-switch-java
-Version: 1.0.0
+Version: 1.1.0
 Release: 1%{?dist}
 Summary: A tool for changing the default Java toolset
 
 Group: Applications/System
 License: GPL
-URL: ftp://sources.redhat.com/pub/rhug/%{name}-%{version}.tar.bz2
-Source0: %{name}-%{version}.tar.bz2
+URL: ftp://sources.redhat.com/pub/rhug
+Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -14,33 +14,28 @@
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python-devel
+
 Requires: chkconfig
+Requires: libglade2
 Requires: libuser
 Requires: newt
+Requires: pygtk2
+Requires: pygtk2-libglade
 Requires: python
 Requires: usermode
+Requires: usermode-gtk
+
+Obsoletes: system-switch-java-gui <= 1.0.0-1.fc7
 
 %description
 The system-switch-java package provides an easy-to-use tool to select
 the default Java toolset for the system.
 
-%package gui
-Summary: A graphical tool for changing the default Java toolset
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-Requires: libglade2
-Requires: pygtk2-libglade
-Requires: pygtk2
-Requires: usermode-gtk
-
-%description gui
-The system-switch-java-gui package provides an easy-to-use graphical
-tool to select the default Java toolset for the system.
-
 %prep
 %setup -q
 
 %build
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -58,23 +53,23 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS README COPYING
-%{_bindir}/*
-%{_sbindir}/*
+%doc AUTHORS README COPYING COPYING.icon
+%{_bindir}/%{name}
+%{_sbindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/switch_java_functions.py*
-%{_datadir}/%{name}/switch_java_tui.py*
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/%{name}*
-
-%files gui
-%defattr(-,root,root)
-%doc COPYING.icon
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/*
 %{_datadir}/%{name}/switch_java_gui.py*
+%{_datadir}/%{name}/switch_java_tui.py*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/%{name}/system-switch-java.glade
+%config(noreplace) /etc/pam.d/%{name}
+%config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Tue Jun 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-1
+- Import system-switch-java 1.1.0.
+- Merge gui subpackage into base package.
+
 * Tue Jan 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.0.0-1
 - Initial release.