From f7c0b2bcb5c25ddbe27dce2255251d4e31e0707ce8da89208c65d7ac9eb4c1e5 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Sep 2010 10:05:26 +0000 Subject: [PATCH 1/3] Accepting request 48045 from home:dimstar:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/48045 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=112 --- nautilus-2.31.90.tar.bz2 | 3 --- nautilus-2.31.92.tar.bz2 | 3 +++ nautilus-no-disable-deprecated.patch | 26 -------------------------- nautilus.changes | 15 +++++++++++++++ nautilus.spec | 15 ++++----------- 5 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 nautilus-2.31.90.tar.bz2 create mode 100644 nautilus-2.31.92.tar.bz2 delete mode 100644 nautilus-no-disable-deprecated.patch diff --git a/nautilus-2.31.90.tar.bz2 b/nautilus-2.31.90.tar.bz2 deleted file mode 100644 index a4733bc..0000000 --- a/nautilus-2.31.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82f61085ee83458724d862c37dfecbad86ea3ec4f370aff74a46f45d8759e63c -size 6143241 diff --git a/nautilus-2.31.92.tar.bz2 b/nautilus-2.31.92.tar.bz2 new file mode 100644 index 0000000..45f44fb --- /dev/null +++ b/nautilus-2.31.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bbf08c9e9661ecedec7bf735cb6f700f330b4914bca811428022b20a46d0ef3 +size 6326919 diff --git a/nautilus-no-disable-deprecated.patch b/nautilus-no-disable-deprecated.patch deleted file mode 100644 index e9d5c23..0000000 --- a/nautilus-no-disable-deprecated.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: nautilus-2.31.6/configure -=================================================================== ---- nautilus-2.31.6.orig/configure -+++ nautilus-2.31.6/configure -@@ -15942,7 +15942,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" - - --DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" -+DISABLE_DEPRECATED_CFLAGS="" - - - for ac_header in X11/XF86keysym.h -Index: nautilus-2.31.6/configure.in -=================================================================== ---- nautilus-2.31.6.orig/configure.in -+++ nautilus-2.31.6/configure.in -@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" - AC_SUBST(CORE_LIBS) - --DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" -+DISABLE_DEPRECATED_CFLAGS="" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - - dnl Multimedia keys diff --git a/nautilus.changes b/nautilus.changes index 769a5b2..f4c4ef8 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Sep 13 14:10:00 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.92: + + String fixes for the file conflict dialog + + Add a border around infobars + + Fix a regression when copy/pasting in list view + + Re-use libunique instead of GApplication + + Drop GDK_DISABLE_DEPRECATED cflag, as we don't want to cope + with recent GDK 2.22 deprecations for the 2.32 branch +- Re-add pkgconfig(unique-1.0) BuildRequires. +- Remove the sed hack for deprecated symbols and remove + disable-maintainer-mode from configure call. +- Drop nautilus-no-disable-deprecated.patch: fixed upstream. + ------------------------------------------------------------------- Wed Sep 8 21:26:59 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 830e023..024f12d 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.31.90) +# spec file for package nautilus (Version 2.31.92) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,10 +22,9 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 2.31.90 -Release: 2 +Version: 2.31.92 +Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in -# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 # fate#308344 bgo#602147 @@ -33,8 +32,6 @@ Source1: mount-archive.desktop Source99: baselibs.conf Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-FIX-OPENSUSE nautilus-no-disable-deprecated.patch vuntz@opensuse.org -- Do not build with *_DISABLE_DEPRECATED flags -Patch0: nautilus-no-disable-deprecated.patch # PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff # PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 bgo581584 federico@novell.com - Use a folder icon instead of a file cabinet window @@ -76,6 +73,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(unique-1.0) Requires: %{name}-lang = %{version} # So that symlinks to icons work: Requires: gnome-icon-theme @@ -116,7 +114,6 @@ This package contains development files for nautilus. %setup -q translation-update-upstream gnome-patch-translation-prepare -%patch0 -p1 %patch4 -p1 %patch5 -p1 #%patch9 -p0 @@ -127,13 +124,9 @@ gnome-patch-translation-prepare gnome-patch-translation-update %build -# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed -sed -i "/-DGDK_DISABLE_DEPRECATED/d" eel/Makefile.{in,am} -sed -i "s/-DGDK_DISABLE_DEPRECATED//" configure.in NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ - --disable-maintainer-mode \ --enable-gtk-doc %__make %{?jobs:-j%jobs} V=1 From 79158601bb50a9c1e49b9b4391a2e2816a42e273a8d20720f69795b257fcc928 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 23 Sep 2010 22:16:17 +0000 Subject: [PATCH 2/3] Accepting request 48951 from GNOME:Factory checked in (request 48951) OBS-URL: https://build.opensuse.org/request/show/48951 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=113 --- nautilus-2.31.90.tar.bz2 | 3 +++ nautilus-2.31.92.tar.bz2 | 3 --- nautilus-no-disable-deprecated.patch | 26 ++++++++++++++++++++++++++ nautilus.changes | 15 --------------- nautilus.spec | 15 +++++++++++---- 5 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 nautilus-2.31.90.tar.bz2 delete mode 100644 nautilus-2.31.92.tar.bz2 create mode 100644 nautilus-no-disable-deprecated.patch diff --git a/nautilus-2.31.90.tar.bz2 b/nautilus-2.31.90.tar.bz2 new file mode 100644 index 0000000..a4733bc --- /dev/null +++ b/nautilus-2.31.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82f61085ee83458724d862c37dfecbad86ea3ec4f370aff74a46f45d8759e63c +size 6143241 diff --git a/nautilus-2.31.92.tar.bz2 b/nautilus-2.31.92.tar.bz2 deleted file mode 100644 index 45f44fb..0000000 --- a/nautilus-2.31.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bbf08c9e9661ecedec7bf735cb6f700f330b4914bca811428022b20a46d0ef3 -size 6326919 diff --git a/nautilus-no-disable-deprecated.patch b/nautilus-no-disable-deprecated.patch new file mode 100644 index 0000000..e9d5c23 --- /dev/null +++ b/nautilus-no-disable-deprecated.patch @@ -0,0 +1,26 @@ +Index: nautilus-2.31.6/configure +=================================================================== +--- nautilus-2.31.6.orig/configure ++++ nautilus-2.31.6/configure +@@ -15942,7 +15942,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" + + +-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" ++DISABLE_DEPRECATED_CFLAGS="" + + + for ac_header in X11/XF86keysym.h +Index: nautilus-2.31.6/configure.in +=================================================================== +--- nautilus-2.31.6.orig/configure.in ++++ nautilus-2.31.6/configure.in +@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" + AC_SUBST(CORE_LIBS) + +-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" ++DISABLE_DEPRECATED_CFLAGS="" + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) + + dnl Multimedia keys diff --git a/nautilus.changes b/nautilus.changes index f4c4ef8..769a5b2 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 13 14:10:00 CEST 2010 - dimstar@opensuse.org - -- Update to version 2.31.92: - + String fixes for the file conflict dialog - + Add a border around infobars - + Fix a regression when copy/pasting in list view - + Re-use libunique instead of GApplication - + Drop GDK_DISABLE_DEPRECATED cflag, as we don't want to cope - with recent GDK 2.22 deprecations for the 2.32 branch -- Re-add pkgconfig(unique-1.0) BuildRequires. -- Remove the sed hack for deprecated symbols and remove - disable-maintainer-mode from configure call. -- Drop nautilus-no-disable-deprecated.patch: fixed upstream. - ------------------------------------------------------------------- Wed Sep 8 21:26:59 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 024f12d..830e023 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.31.92) +# spec file for package nautilus (Version 2.31.90) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,9 +22,10 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 2.31.92 -Release: 1 +Version: 2.31.90 +Release: 2 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in +# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 # fate#308344 bgo#602147 @@ -32,6 +33,8 @@ Source1: mount-archive.desktop Source99: baselibs.conf Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-OPENSUSE nautilus-no-disable-deprecated.patch vuntz@opensuse.org -- Do not build with *_DISABLE_DEPRECATED flags +Patch0: nautilus-no-disable-deprecated.patch # PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff # PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 bgo581584 federico@novell.com - Use a folder icon instead of a file cabinet window @@ -73,7 +76,6 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pango) -BuildRequires: pkgconfig(unique-1.0) Requires: %{name}-lang = %{version} # So that symlinks to icons work: Requires: gnome-icon-theme @@ -114,6 +116,7 @@ This package contains development files for nautilus. %setup -q translation-update-upstream gnome-patch-translation-prepare +%patch0 -p1 %patch4 -p1 %patch5 -p1 #%patch9 -p0 @@ -124,9 +127,13 @@ gnome-patch-translation-prepare gnome-patch-translation-update %build +# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed +sed -i "/-DGDK_DISABLE_DEPRECATED/d" eel/Makefile.{in,am} +sed -i "s/-DGDK_DISABLE_DEPRECATED//" configure.in NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ + --disable-maintainer-mode \ --enable-gtk-doc %__make %{?jobs:-j%jobs} V=1 From f3975b4bf0db32dfa0f15a160660844c14f1eeee9824573b51f8135caffa8147 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 23 Sep 2010 22:16:18 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/nautilus revision 85.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=af8ad7509da451e52b58b9dd9ef3b1f3 --- nautilus-2.31.90.tar.bz2 | 3 --- nautilus-2.31.92.tar.bz2 | 3 +++ nautilus-no-disable-deprecated.patch | 26 -------------------------- nautilus.changes | 15 +++++++++++++++ nautilus.spec | 15 ++++----------- 5 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 nautilus-2.31.90.tar.bz2 create mode 100644 nautilus-2.31.92.tar.bz2 delete mode 100644 nautilus-no-disable-deprecated.patch diff --git a/nautilus-2.31.90.tar.bz2 b/nautilus-2.31.90.tar.bz2 deleted file mode 100644 index a4733bc..0000000 --- a/nautilus-2.31.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82f61085ee83458724d862c37dfecbad86ea3ec4f370aff74a46f45d8759e63c -size 6143241 diff --git a/nautilus-2.31.92.tar.bz2 b/nautilus-2.31.92.tar.bz2 new file mode 100644 index 0000000..45f44fb --- /dev/null +++ b/nautilus-2.31.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bbf08c9e9661ecedec7bf735cb6f700f330b4914bca811428022b20a46d0ef3 +size 6326919 diff --git a/nautilus-no-disable-deprecated.patch b/nautilus-no-disable-deprecated.patch deleted file mode 100644 index e9d5c23..0000000 --- a/nautilus-no-disable-deprecated.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: nautilus-2.31.6/configure -=================================================================== ---- nautilus-2.31.6.orig/configure -+++ nautilus-2.31.6/configure -@@ -15942,7 +15942,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" - - --DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" -+DISABLE_DEPRECATED_CFLAGS="" - - - for ac_header in X11/XF86keysym.h -Index: nautilus-2.31.6/configure.in -=================================================================== ---- nautilus-2.31.6.orig/configure.in -+++ nautilus-2.31.6/configure.in -@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" - AC_SUBST(CORE_LIBS) - --DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" -+DISABLE_DEPRECATED_CFLAGS="" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - - dnl Multimedia keys diff --git a/nautilus.changes b/nautilus.changes index 769a5b2..f4c4ef8 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Sep 13 14:10:00 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.92: + + String fixes for the file conflict dialog + + Add a border around infobars + + Fix a regression when copy/pasting in list view + + Re-use libunique instead of GApplication + + Drop GDK_DISABLE_DEPRECATED cflag, as we don't want to cope + with recent GDK 2.22 deprecations for the 2.32 branch +- Re-add pkgconfig(unique-1.0) BuildRequires. +- Remove the sed hack for deprecated symbols and remove + disable-maintainer-mode from configure call. +- Drop nautilus-no-disable-deprecated.patch: fixed upstream. + ------------------------------------------------------------------- Wed Sep 8 21:26:59 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 830e023..024f12d 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.31.90) +# spec file for package nautilus (Version 2.31.92) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,10 +22,9 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 2.31.90 -Release: 2 +Version: 2.31.92 +Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in -# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 # fate#308344 bgo#602147 @@ -33,8 +32,6 @@ Source1: mount-archive.desktop Source99: baselibs.conf Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-FIX-OPENSUSE nautilus-no-disable-deprecated.patch vuntz@opensuse.org -- Do not build with *_DISABLE_DEPRECATED flags -Patch0: nautilus-no-disable-deprecated.patch # PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff # PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 bgo581584 federico@novell.com - Use a folder icon instead of a file cabinet window @@ -76,6 +73,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(unique-1.0) Requires: %{name}-lang = %{version} # So that symlinks to icons work: Requires: gnome-icon-theme @@ -116,7 +114,6 @@ This package contains development files for nautilus. %setup -q translation-update-upstream gnome-patch-translation-prepare -%patch0 -p1 %patch4 -p1 %patch5 -p1 #%patch9 -p0 @@ -127,13 +124,9 @@ gnome-patch-translation-prepare gnome-patch-translation-update %build -# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed -sed -i "/-DGDK_DISABLE_DEPRECATED/d" eel/Makefile.{in,am} -sed -i "s/-DGDK_DISABLE_DEPRECATED//" configure.in NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ - --disable-maintainer-mode \ --enable-gtk-doc %__make %{?jobs:-j%jobs} V=1