-- * The summary appears on the titlebar of notification and body appears as -- * its text. Icon may be a string defining a theme icon or the filename -- * identifying the icon that appears next to text. Attach identifies the -- * widget that the notification relates to. -- * -- *
-- * Note that all but summary can be null.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
-- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
-- */
--
-- public Notification(String summary, String body, String icon, Widget attach) {
-- super(NotifyNotification.createNotification(summary, body, icon, attach));
-- }
--
-- /**
-- * Create a new notification attached to a {@link StatusIcon}. See
-- * {@link #Notification(String,String,String,Widget) Notification()} for
-- * other parameters.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
-- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
-- */
-- public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
-- super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
-+ super(NotifyNotification.createNotification(summary, body, icon));
- }
-
- /**
-@@ -131,39 +97,6 @@
- }
-
- /**
-- * Attaches Notification to a Widget setting hints to its location.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
-- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
-- */
-- public void attach(Widget attach) {
-- NotifyNotification.attachToWidget(this, attach);
-- }
--
-- /**
-- * Attaches Notification to a {@link StatusIcon} setting hints to its
-- * location.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
-- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
-- */
-- public void attach(StatusIcon statusIcon) {
-- NotifyNotification.attachToStatusIcon(this, statusIcon);
-- }
--
-- /**
-- * Sets the position of the notification to display on screen.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3
-- */
-- public void setGeometryHints(Screen screen, int x, int y) {
-- NotifyNotification.setGeometryHints(this, screen, x, y);
-- }
--
-- /**
- * Display the notification on screen.
- *
- * @since 4.0.12
-
-=== modified file 'src/defs/NotifyNotification.defs'
---- src/defs/NotifyNotification.defs 2009-05-16 05:46:28 +0000
-+++ src/defs/NotifyNotification.defs 2011-01-31 17:58:10 +0000
-@@ -15,19 +15,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "body" (null-ok))
- '("const-gchar*" "icon" (null-ok))
-- '("GtkWidget*" "attach" (null-ok))
-- )
--)
--
--(define-function notify_notification_new_with_status_icon
-- (is-constructor-of "NotifyNotification")
-- (c-name "notify_notification_new_with_status_icon")
-- (return-type "NotifyNotification*")
-- (parameters
-- '("const-gchar*" "summary")
-- '("const-gchar*" "body" (null-ok))
-- '("const-gchar*" "icon" (null-ok))
-- '("GtkStatusIcon*" "status_icon")
- )
- )
-
-@@ -42,35 +29,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "status_icon")
-- )
--)
--
--(define-method set_geometry_hints
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_set_geometry_hints")
-- (return-type "none")
-- (parameters
-- '("GdkScreen*" "screen")
-- '("gint" "x")
-- '("gint" "y")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
-
-# Begin bundle
-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
-5IpwoSEBdhhE
diff --git a/java-gnome-4.0.20-libnotify-0.7.patch b/java-gnome-4.0.20-libnotify-0.7.patch
deleted file mode 100644
index 84b9082..0000000
--- a/java-gnome-4.0.20-libnotify-0.7.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -ur java-gnome-4.0.20.orig/configure java-gnome-4.0.20.libnotify/configure
---- java-gnome-4.0.20.orig/configure 2011-07-11 03:13:12.000000000 +0200
-+++ java-gnome-4.0.20.libnotify/configure 2011-07-11 23:22:52.203647600 +0200
-@@ -805,7 +805,7 @@
- "gtkspell");
-
- check_system_library(@gnomedev_libs,
-- "libnotify >= 0.4.5 libnotify < 0.7.0",
-+ "libnotify >= 0.7.0",
- "LibNotify",
- "libnotify");
-
-@@ -853,7 +853,7 @@
- "FIXME");
-
- check_system_library(@gnomedev_libs,
-- "libnotify >= 0.4.5 libnotify < 0.7.0",
-+ "libnotify >= 0.7.0",
- "LibNotify",
- "FIXME");
-
-@@ -917,7 +917,7 @@
- "libgtksourceview2.0-dev");
-
- check_system_library(@gnomedev_libs,
-- "libnotify >= 0.4.5 libnotify < 0.7.0",
-+ "libnotify >= 0.7.0",
- "LibNotify",
- "libnotify-dev");
-
-@@ -968,7 +968,7 @@
- "FIXME");
-
- check_system_library(@gnomedev_libs,
-- "libnotify >= 0.4.5 libnotify < 0.7.0",
-+ "libnotify >= 0.7.0",
- "LibNotify",
- "FIXME");
-
-@@ -1020,7 +1020,7 @@
- "lib${cpu_arch}gtksourceview-2.0-devel");
-
- check_system_library(@gnomedev_libs,
-- "libnotify >= 0.4.5 libnotify < 0.7.0",
-+ "libnotify >= 0.7.0",
- "LibNotify",
- "lib${cpu_arch}notify-devel");
-
-@@ -1083,7 +1083,7 @@
- "gtksourceview2-devel");
-
- check_system_library(@gnomedev_libs,
-- "libnotify >= 0.4.5 libnotify < 0.7.0",
-+ "libnotify >= 0.7.0",
- "LibNotify",
- "libnotify-devel");
-
-Endast i java-gnome-4.0.20.libnotify: configure~
-diff -ur java-gnome-4.0.20.orig/doc/examples/notify/ExampleLowBattery.java java-gnome-4.0.20.libnotify/doc/examples/notify/ExampleLowBattery.java
---- java-gnome-4.0.20.orig/doc/examples/notify/ExampleLowBattery.java 2011-07-11 03:13:12.000000000 +0200
-+++ java-gnome-4.0.20.libnotify/doc/examples/notify/ExampleLowBattery.java 2011-07-11 23:23:05.827558720 +0200
-@@ -61,7 +61,7 @@
- */
-
- notification = new Notification("Low Battery Example", "Your battery is low!",
-- "messagebox_warning", icon);
-+ "messagebox_warning");
-
- /*
- * Quit the application after notification disappears.
-Endast i java-gnome-4.0.20.libnotify/doc/examples/notify: ExampleLowBattery.java~
-diff -ur java-gnome-4.0.20.orig/src/bindings/org/gnome/notify/Notification.java java-gnome-4.0.20.libnotify/src/bindings/org/gnome/notify/Notification.java
---- java-gnome-4.0.20.orig/src/bindings/org/gnome/notify/Notification.java 2011-07-11 03:13:12.000000000 +0200
-+++ java-gnome-4.0.20.libnotify/src/bindings/org/gnome/notify/Notification.java 2011-07-11 23:26:19.123297334 +0200
-@@ -80,45 +80,7 @@
- */
-
- public Notification(String summary, String body, String icon) {
-- super(NotifyNotification.createNotification(summary, body, icon, null));
-- }
--
-- /**
-- * Create a new notification.
-- *
-- *
-- * The summary appears on the titlebar of notification and body appears as -- * its text. Icon may be a string defining a theme icon or the filename -- * identifying the icon that appears next to text. Attach identifies the -- * widget that the notification relates to. -- * -- *
-- * Note that all but summary can be null.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets
-- * and status icons. See
-- * http://live.gnome.org/GnomeShell/Design
-- * /Guidelines/MessageTray/Compatibility
-- */
--
-- public Notification(String summary, String body, String icon, Widget attach) {
-- super(NotifyNotification.createNotification(summary, body, icon, attach));
-- }
--
-- /**
-- * Create a new notification attached to a {@link StatusIcon}. See
-- * {@link #Notification(String,String,String,Widget) Notification()} for
-- * other parameters.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets
-- * and status icons. See
-- * http://live.gnome.org/GnomeShell/Design
-- * /Guidelines/MessageTray/Compatibility
-- */
-- public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
-- super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
-+ super(NotifyNotification.createNotification(summary, body, icon));
- }
-
- /**
-@@ -135,43 +97,6 @@
- }
-
- /**
-- * Attaches Notification to a Widget setting hints to its location.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets
-- * and status icons. See
-- * http://live.gnome.org/GnomeShell/Design
-- * /Guidelines/MessageTray/Compatibility
-- */
-- public void attach(Widget attach) {
-- NotifyNotification.attachToWidget(this, attach);
-- }
--
-- /**
-- * Attaches Notification to a {@link StatusIcon} setting hints to its
-- * location.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3, notifications will be independent of widgets
-- * and status icons. See
-- * http://live.gnome.org/GnomeShell/Design
-- * /Guidelines/MessageTray/Compatibility
-- */
-- public void attach(StatusIcon statusIcon) {
-- NotifyNotification.attachToStatusIcon(this, statusIcon);
-- }
--
-- /**
-- * Sets the position of the notification to display on screen.
-- *
-- * @since 4.0.12
-- * @deprecated In GNOME 3
-- */
-- public void setGeometryHints(Screen screen, int x, int y) {
-- NotifyNotification.setGeometryHints(this, screen, x, y);
-- }
--
-- /**
- * Display the notification on screen.
- *
- * @since 4.0.12
-Endast i java-gnome-4.0.20.libnotify/src/bindings/org/gnome/notify: Notification.java~
-diff -ur java-gnome-4.0.20.orig/src/defs/NotifyNotification.defs java-gnome-4.0.20.libnotify/src/defs/NotifyNotification.defs
---- java-gnome-4.0.20.orig/src/defs/NotifyNotification.defs 2011-07-11 03:13:12.000000000 +0200
-+++ java-gnome-4.0.20.libnotify/src/defs/NotifyNotification.defs 2011-07-11 23:27:14.920933091 +0200
-@@ -15,19 +15,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "body" (null-ok))
- '("const-gchar*" "icon" (null-ok))
-- '("GtkWidget*" "attach" (null-ok))
-- )
--)
--
--(define-function notify_notification_new_with_status_icon
-- (is-constructor-of "NotifyNotification")
-- (c-name "notify_notification_new_with_status_icon")
-- (return-type "NotifyNotification*")
-- (parameters
-- '("const-gchar*" "summary")
-- '("const-gchar*" "body" (null-ok))
-- '("const-gchar*" "icon" (null-ok))
-- '("GtkStatusIcon*" "status_icon")
- )
- )
-
-@@ -42,35 +29,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "status_icon")
-- )
--)
--
--(define-method set_geometry_hints
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_set_geometry_hints")
-- (return-type "none")
-- (parameters
-- '("GdkScreen*" "screen")
-- '("gint" "x")
-- '("gint" "y")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
-Endast i java-gnome-4.0.20.libnotify/src/defs: NotifyNotification.defs~
diff --git a/java-gnome-fedorajpkg-compat.patch b/java-gnome-fedorajpkg-compat.patch
deleted file mode 100644
index 6688c7e..0000000
--- a/java-gnome-fedorajpkg-compat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- configure 2010-06-17 02:13:17.000000000 +0200
-+++ configure.fedjpkgcompat 2010-07-17 14:08:10.952997785 +0200
-@@ -623,7 +623,7 @@
- # and Ubuntu
- $os = "debian";
- } elsif ( -f "/etc/fedora-release" ) {
-- output "Fedora Core";
-+ output "Fedora";
- $os = "fedora";
- } elsif ( -f "/etc/SuSE-release" ) {
- output "Open SuSE";
-@@ -642,6 +642,15 @@
- } elsif ( -f "/etc/slackware-version" ) {
- output "Slackware";
- $os = "slackware";
-+} elsif ( -f "/etc/centos-release" ) {
-+ output "CentOS";
-+ $os = "fedora";
-+} elsif ( -f "/etc/redhat-release" ) {
-+ output "RedHat";
-+ $os = "fedora";
-+} elsif ( -f "/etc/java/jpackage-release" ) {
-+ output "JPackage";
-+ $os = "fedora";
- }
-
- if ($os) {
-@@ -1146,11 +1155,11 @@
- $javadoc_candidate = "$jdk_home/bin/javadoc";
- $vendor = "Specified";
- } else {
-- $javac_candidate = "/usr/lib/jvm/java-ibm/bin/javac";
-- $javah_candidate = "/usr/lib/jvm/java-ibm/bin/javah";
-- $jar_candidate = "/usr/lib/jvm/java-ibm/bin/jar";
-- $javadoc_candidate = "/usr/lib/jvm/java-ibm/bin/javadoc";
-- $vendor = "IBM";
-+ $javac_candidate = "/usr/bin/javac";
-+ $javah_candidate = "/usr/bin/javah";
-+ $jar_candidate = "/usr/bin/jar";
-+ $javadoc_candidate = "/usr/bin/javadoc";
-+ $vendor = "System Default";
- }
- check_compiler($javac, "$vendor javac", $javac_candidate, "-g -source 1.5 -target 1.5");
-
-@@ -1515,8 +1524,8 @@
- $java_candidate = "$jdk_home/bin/java";
- $vendor = "Specified";
- } else {
-- $java_candidate = "/usr/lib/jvm/jre-ibm/bin/java";
-- $vendor = "IBM";
-+ $java_candidate = "/usr/bin/java";
-+ $vendor = "System Default";
- }
- check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea");
-
-@@ -1998,6 +2007,9 @@
- my $jni_include = "";
- my $java_home = dirname($java);
- $java_home =~ s/\/bin$//;
-+ if ($os eq "fedora" && $java_home eq "/usr") {
-+ $java_home = "/usr/lib/jvm/java";
-+ }
-
- if (!-d "$java_home"."/include") {
- $java_home =~ s/\/jre//;
diff --git a/java-gnome-jpackage-compatible-new.patch b/java-gnome-jpackage-compatible-new.patch
deleted file mode 100644
index c15d0da..0000000
--- a/java-gnome-jpackage-compatible-new.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.jpackagecompat 2009-05-01 06:11:11.000000000 +0200
-+++ configure 2009-06-30 00:44:32.000000000 +0200
-@@ -43,6 +43,7 @@
- #
-
- my $os;
-+my $vmlayout;
- my $quiet;
-
- # There's nothing worse than having an old config file, getting half way
-@@ -654,6 +655,12 @@
-
- output "\n";
-
-+if ( -f "/etc/java/jpackage-release" ) {
-+ $vmlayout = "jpackage";
-+} else {
-+ $vmlayout = "unknown";
-+}
-+
- # --------------------------------------------------------------------
- # Specify locations of dependencies, by operating system, and
- # verify pre-requisites are present.
-@@ -857,9 +864,17 @@
- my $javah;
- my $jar;
- my $javadoc;
--
-+if ($vmlayout eq "jpackage") {
-+ my $vendor = "System";
-+ check_compiler($javac, "$vendor javac", "/usr/bin/javac", "-g -source 5 -target 5");
-+ check_jni_header_generator($javah, "$vendor javah", "/usr/bin/javah", "-jni");
-+ check_jar($jar, "System jar", "/usr/bin/jar", "");
-+ check_javadoc($javadoc, "$vendor javadoc", "/usr/bin/javadoc", "");
-+} else {
-+ output "Unknown VM layout, trying OS-specific routines\n";
-+}
-+if (!$javac) {
- if ($os eq "gentoo") {
--
- if ( ! -x "/usr/bin/java-config") {
- bail "", "INTERNAL ERROR couldn't find java-config";
- }
-@@ -1245,6 +1260,7 @@
- } else {
- bail "failed!", "This OS not configured with a workable Java compiler checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG.";
- }
-+}
-
- output "\n";
-
-@@ -1261,6 +1277,13 @@
- my $cacao;
- my $jamvm;
-
-+if ($vmlayout eq "jpackage") {
-+ my $vendor = "System";
-+ check_runtime($java, "$vendor javac", "/usr/bin/java", "-client -ea");
-+} else {
-+ output "Unknown VM layout, trying OS-specific routines\n";
-+}
-+if (!$java) {
- if ($os eq "gentoo") {
- # check java (the one specified by Gentoo's java-config tool)
- # Is there any actual scenario where the javac would be from one
-@@ -1641,6 +1664,7 @@
- } else {
- bail "failed!", "This OS not configured with appropriate Java VM checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG.";
- }
-+}
-
- output "\n";
-
-@@ -1865,7 +1889,15 @@
-
- my $jni_include = "";
- my $java_home = dirname($java);
-+ my $java_home;
-+ if ($vmlayout = "jpackage") {
-+ $java_home = dirname(`readlink /etc/alternatives/javac`);
-+ chomp($java_home);
-+ } else {
-+ $java_home = dirname($java);
-+ }
- $java_home =~ s/\/bin$//;
-+ output "Using Java SDK home: $java_home\n";
-
- if (!-d "$java_home"."/include") {
- $java_home =~ s/\/jre//;
diff --git a/java-gnome.spec b/java-gnome.spec
index d3b7882..2011380 100644
--- a/java-gnome.spec
+++ b/java-gnome.spec
@@ -1,29 +1,26 @@
Summary: Java GNOME bindings
Name: java-gnome
-Version: 4.0.20
+Version: 4.1.1
Release: 1%{?dist}
URL: http://java-gnome.sourceforge.net
Source0: http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.xz
# This is the "Classpath" exception.
License: GPLv2 with exceptions
Group: System Environment/Libraries
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: pkgconfig
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(cairo-svg)
BuildRequires: pkgconfig(enchant)
-BuildRequires: pkgconfig(gdk-2.0)
+BuildRequires: pkgconfig(gdk-3.0)
BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: pkgconfig(gtk+-unix-print-2.0)
-BuildRequires: pkgconfig(gtksourceview-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtk+-unix-print-3.0)
+BuildRequires: pkgconfig(gtksourceview-3.0)
BuildRequires: pkgconfig(gtkspell-2.0)
-BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(pango)
-BuildRequires: pkgconfig(unique-1.0)
+BuildRequires: pkgconfig(unique-3.0)
BuildRequires: pkgconfig(librsvg-2.0)
-BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: gettext
BuildRequires: junit
BuildRequires: python
@@ -31,14 +28,6 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-# A backport from the 4.1 branch, but unfortunately this causes an
-# incompatible change in the gtk-4.0.jar API as it removes the parts
-# that cannot be implemented with libnotify 0.7.
-%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
-Patch0: java-gnome-4.0.20-libnotify-0.7.patch
-%endif
-# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=715804
-Patch1: java-gnome-javadocbuild.patch
%description
These are the Java bindings for GTK and GNOME! Featuring a robust
@@ -64,11 +53,6 @@ design documentation and sample code.
%prep
%setup -q
-%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
-%patch0 -p1 -b .libnotify07
-rm -f doc/examples/*/*.java.libnotify07
-%endif
-%patch1 -p0 -b .javadocbuild
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."
@@ -90,11 +74,6 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_javadir}
make install DESTDIR=%{buildroot}
-%if (0%{?fedora} >= 13 && 0%{?fedora} < 15)
-mv %{buildroot}%{_libdir}/%{name}/gtk-4.0.jar %{buildroot}%{_libdir}/%{name}/java-gnome.jar
-ln -s java-gnome.jar %{buildroot}%{_libdir}/%{name}/gtk-4.0.jar
-%endif
-
mkdir -p %{buildroot}%{_javadocdir}
cp -rp doc/api %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
@@ -118,6 +97,11 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}-%{version}
%changelog
+* Tue Jul 12 2011 Alexander Boström