[java-gnome] Make the libnotify patch conditional.

abo abo at fedoraproject.org
Sat Apr 2 23:12:48 UTC 2011


commit 07fae3b93a34c87d91ad926c7fa8ca1729d032f6
Author: Alexander Boström <abo at root.snowtree.se>
Date:   Sun Apr 3 01:02:17 2011 +0200

    Make the libnotify patch conditional.

 java-gnome.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/java-gnome.spec b/java-gnome.spec
index d19e0a5..9e24422 100644
--- a/java-gnome.spec
+++ b/java-gnome.spec
@@ -1,7 +1,7 @@
 Summary:	Java GNOME bindings
 Name:		java-gnome
 Version:	4.0.19
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.bz2
 # This is the "Classpath" exception.
@@ -35,7 +35,9 @@ Requires:	jpackage-utils
 # incompatible change in the gtk-4.0.jar API as it removes the parts
 # that cannot be implemented with libnotify 0.7.  Is likely to appear
 # in 4.0.20 as well.
+%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
 Patch0:	java-gnome-4.0.19-libnotify-0.7.patch
+%endif
 
 %description
 These are the Java bindings for GTK and GNOME! Featuring a robust 
@@ -61,7 +63,9 @@ design documentation and sample code.
 
 %prep
 %setup -q
+%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
 %patch0 -p0 -b .libnotify07
+%endif
 
 if find -name '*.class' -o -name '*.jar' | grep . >&2; then
     echo >&2 "Prebuilt binaries found in the sources. See https://fedoraproject.org/wiki/Packaging:Java#Pre-built_JAR_files_.2F_Other_bundled_software for instructions."
@@ -109,6 +113,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sun Apr 03 2011 Alexander Boström <abo at root.snowtree.se> - 4.0.19-2
+- Make the libnotify patch conditional.
+
 * Sat Apr 02 2011 Alexander Boström <abo at root.snowtree.se> - 4.0.19-1
 - Update to the latest release.
 - Patch for libnotify 0.7 compatibility.


More information about the scm-commits mailing list