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

Accepting request 44684 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 44684 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/44684
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=104
This commit is contained in:
Vincent Untz 2010-08-06 09:10:05 +00:00 committed by Git OBS Bridge
parent a15009bc1c
commit 325c35f96a
3 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,26 @@
Index: nautilus-2.30.1/configure
===================================================================
--- nautilus-2.30.1.orig/configure
+++ nautilus-2.30.1/configure
@@ -19329,7 +19329,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=""
Index: nautilus-2.30.1/configure.in
===================================================================
--- nautilus-2.30.1.orig/configure.in
+++ nautilus-2.30.1/configure.in
@@ -339,7 +339,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

10
nautilus.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Aug 6 10:50:55 CEST 2010 - vuntz@opensuse.org
- Split out libnautilus-extension1 to reduce packages dependencies.
Thanks to Andrea Florio <andrea@opensuse.org>.
- Add nautilus-no-disable-deprecated.patch to fix build with recent
versions of GTK+ that have more deprecations.
- Make the build verbose.
- Improve summaries and descriptions.
-------------------------------------------------------------------
Mon Jun 14 11:24:19 CEST 2010 - vuntz@opensuse.org

37
nautilus.spec
View File

@ -45,13 +45,15 @@ License: GPLv2+
Group: Productivity/File utilities
Version: 2.30.1
Release: 3
Summary: The GNOME 2.x Desktop File Manager
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
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
@ -75,30 +77,38 @@ Obsoletes: nautilus2 < %{version}
%gconf_schemas_prereq
%description
This package contains Nautilus, the advanced file manager for the GNOME
2.x Desktop platform.
Nautilus is the file manager for the GNOME desktop.
%package -n libnautilus-extension1
License: GPLv2+
Group: System/Libraries
Summary: Extensions Library for Nautilus
Summary: File Manager for the GNOME Desktop -- Extension Library
%description -n libnautilus-extension1
Nautilus is the file manager for the GNOME desktop.
This package contains the library used by nautilus extensions.
%package devel
License: GPLv2+
Summary: Development Package for Nautilus
Summary: File Manager for the GNOME Desktop -- Development Files
Group: Development/Libraries/GNOME
Requires: %{name} = %{version} glib2-devel gtk2-devel
Provides: nautilus2-devel = %{version}
Obsoletes: nautilus2-devel < %{version}
%description devel
This package contains all files needed to develop programs that use
features of the Nautilus file manager.
Nautilus is the file manager for the GNOME desktop.
This package contains development files for nautilus.
%lang_package
%prep
%setup -q
translation-update-upstream
gnome-patch-translation-prepare
%patch0 -p1
%patch4 -p1
%patch5 -p1
#%patch9 -p0
@ -113,7 +123,7 @@ NOCONFIGURE=1 gnome-autogen.sh
%configure\
--disable-update-mimedb \
--enable-gtk-doc
%__make %{?jobs:-j%jobs}
%__make %{?jobs:-j%jobs} V=1
%install
%makeinstall
@ -154,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
@ -164,11 +173,14 @@ fi
%preun -f %{name}.schemas_preun
%postun
/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%post -n libnautilus-extension1 -p /sbin/ldconfig
%postun -n libnautilus-extension1 -p /sbin/ldconfig
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO
@ -179,11 +191,14 @@ fi
%{_datadir}/pixmaps/nautilus
%{_datadir}/pixmaps/*.png
%{_datadir}/icons/hicolor/*/*/*.*
%{_libdir}/*.so.*
%{_libexecdir}/nautilus-convert-metadata
%doc %{_mandir}/man1/nautilus*.1.gz
%files -n libnautilus-extension1
%defattr(-,root,root)
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-2.0
%{_libdir}/libnautilus-extension.so.*
%files lang -f %{name}.lang