[thermostat/f19] Delete now unused patch and add proper FIXME comments for patches.

jerboaa jerboaa at fedoraproject.org
Fri May 31 10:17:23 UTC 2013


commit e94432033c8f21f16dea6d2ec291c726563512af
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Fri May 31 12:11:51 2013 +0200

    Delete now unused patch and add proper FIXME comments for patches.

 disable_webservice_cmd.patch |   45 ------------------------------------------
 thermostat.spec              |   34 ++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 57 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index a3749a0..a532ad4 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -19,30 +19,40 @@ Source0:    http://icedtea.classpath.org/download/%{name}/%{name}-%{version}.tar
 # This is the source to be used for hg snapshot versions
 #wget -O thermostat-%{hgrev}.tar.bz2 http://icedtea.classpath.org/hg/%{name}/archive/%{hgrev}.tar.bz2
 #Source0:    thermostat-%{hgrev}.tar.bz2
-# This is not suitable for upstream as it is *very* Fedora specific
+# This is _NOT_ suitable for upstream at this point.
+# It's very Fedora specific.
 Source1:    thermostat-sysconfig
-# This has been proposed upstream. Should get removed next release.
+# FIXME: This has been fixed upstream with rev 9c20c3b08192.
+#        Should get removed next release.
 Patch0:     init_layout_new.patch
-# This is not suitable for upstream. Distribution specific workings.
+# This is _NOT_ suitable for upstream at this point.
+# It makes thermostat work with system (non-writable) installations.
 Patch1:     source_setup_user_home.patch
-# Fix JNI class UserNameUtilImpl (proposed upstream remove next release).
+# FIXME: This has been fixed upstream with rev 9c1ebac8d0b9.
+#        Should get removed next release.
 Patch2:     username_util.patch
-# Use System.load() over System.loadLibrary() as per Java packaging guidelines.
-# Should be upstream-able.
+# FIXME: This has been fixed upstream with rev edb423d5d5a0.
+#        Should get removed next release.
 Patch3:     fix_natives.patch
+# This is _NOT_ suitable for upstream at this point.
 # jfreechart isn't a bundle upstream. Also some httpclient* related bundles
-# include transitive deps, which is properly done in Fedora.
+# include transitive deps upstream, which isn't the case in Fedora (i.e. is
+# properly done in Fedora)
 Patch4:     fix_bundle_loading.patch
-# There seems to be a problem when using class vs. class name.
-# Proposed upstream. Remove once pushed upstream.
+# There seems to be a problem when using class vs. class name
+# (i.e. Klass.class vs. Klass.class.getName()).
+# Proposed upstream. Unsure if something like this will be required for next
+# release.
 Patch5:     fix_jmx_compilation_error.patch
-# Extending webservice command (which won't exist after a fedora build) fix.
+# FIXME: This has been fixed upstream with rev c6ad4123876e.
+#        Should get removed next release.
 Patch6:     extend_webservice_fix.patch
+# This is _NOT_ suitable for upstream at this point.
 # Sets the default log level to something reasonable (if during release procedure
 # it was forgotten to set it). Not upstream-able.
 Patch7:     fix_loglevel.patch
-# systemd files need to source for THERMOSTAT_HOME. Proposed upstream. Should get
-# removed for the next upstream release.
+# FIXME: This has been fixed upstream with rev cffa49e21080.
+#        Should get removed next release.
 Patch8:     systemd_fixes.patch
 
 BuildRequires:  java-devel >= 1:1.7.0


More information about the scm-commits mailing list