rpms/system-switch-java/devel system-switch-java-trailing-newlines.patch, NONE, 1.1 system-switch-java.spec, 1.6, 1.7

Thomas Fitzsimmons (fitzsim) fedora-extras-commits at redhat.com
Sat Jul 21 05:20:36 UTC 2007


Author: fitzsim

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

Modified Files:
	system-switch-java.spec 
Added Files:
	system-switch-java-trailing-newlines.patch 
Log Message:
* Sat Jul 21 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-4
- Tolerate trailing newlines in alternatives file.
- Bump release number.



system-switch-java-trailing-newlines.patch:

--- NEW FILE system-switch-java-trailing-newlines.patch ---
diff -ur ../system-switch-java-1.1.0.orig/switch_java_functions.py.in ./switch_java_functions.py.in
--- ../system-switch-java-1.1.0.orig/switch_java_functions.py.in	2007-06-25 01:37:22.000000000 -0400
+++ ./switch_java_functions.py.in	2007-07-21 00:13:05.000000000 -0400
@@ -130,6 +130,10 @@
         # index points to target.
         while index < len(lines):
             line = lines[index]
+            # accept trailing blank lines at the end of the file.
+            # Debian's update-alternatives requires this.
+            if line == '\n':
+                break
             alternatives.append(\
                 line[len('/usr/lib/jvm/jre-'):-(len('/bin/java') + 1)])
             index = index + 1


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-switch-java.spec	15 Jul 2007 03:59:00 -0000	1.6
+++ system-switch-java.spec	21 Jul 2007 05:20:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name: system-switch-java
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A tool for changing the default Java toolset
 
 Group: Applications/System
@@ -8,6 +8,7 @@
 URL: ftp://sources.redhat.com/pub/rhug
 Source0: %{name}-%{version}.tar.gz
 Patch0: %{name}-desktop.patch
+Patch1: %{name}-trailing-newlines.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure
@@ -67,6 +69,10 @@
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Sat Jul 21 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-4
+- Tolerate trailing newlines in alternatives file.
+- Bump release number.
+
 * Sat Jul 14 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-3
 - Use Fedora 8 desktop file categories.
 - Use desktop-file-install.




More information about the fedora-extras-commits mailing list