pool/nautilus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/nautilus revision 85.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=af8ad7509da451e52b58b9dd9ef3b1f3
This commit is contained in:
OBS User buildservice-autocommit 2010-09-23 22:16:18 +00:00 committed by Git OBS Bridge
parent 79158601bb
commit f3975b4bf0
5 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nautilus-2.31.90.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82f61085ee83458724d862c37dfecbad86ea3ec4f370aff74a46f45d8759e63c
size 6143241

3
nautilus-2.31.92.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8bbf08c9e9661ecedec7bf735cb6f700f330b4914bca811428022b20a46d0ef3
size 6326919

26
nautilus-no-disable-deprecated.patch
View File

@ -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

15
nautilus.changes
View File

@ -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

15
nautilus.spec
View File

@ -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