Accepting request 69136 from GNOME:Apps

Pushing G:A changes related to GNOME 3 (either needed by GNOME 3, or needed to build with GNOME 3)

OBS-URL: https://build.opensuse.org/request/show/69136
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/deja-dup?expand=0&rev=10
This commit is contained in:
Sascha Peilicke 2011-05-16 09:55:43 +00:00 committed by Git OBS Bridge
commit 7b013818a2
5 changed files with 136 additions and 43 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92fc7d39f20d2a5049e3a868902c85b6875a74b19a19f4f3e64c98db834cea72
size 934708

3
deja-dup-18.1.1.tar.bz2 Normal file
View File

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

View File

@ -1,12 +0,0 @@
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -119,6 +119,7 @@ AC_SUBST(PREF_CFLAGS)
AC_SUBST(PREF_LIBS)
PKG_CHECK_MODULES(COMMON,
+ $GTK_MODULE >= $GTK_REQ_VER
gio-2.0 >= $GIO_REQ_VER
gio-unix-2.0 >= $GIO_REQ_VER
gconf-2.0

View File

@ -1,3 +1,99 @@
-------------------------------------------------------------------
Wed Apr 27 09:48:23 CEST 2011 - dimstar@opensuse.org
- Update to version 18.1.1:
+ Actually work with NetworkManager 0.9
+ Updated translations.
- Changes from version 18.1:
+ Work with NetworkManager 0.9
- Changes from version 18.0:
+ If using an older duplicity and it gives a certain bogus "time
not moving forward" error, handle it instead of passing the
error along
+ Create backup location folder if it doesn't exist
+ Don't show duplicate external hard drives.
- Changes from version 17.92:
- Re-enabled support for resuming a backup, if using the
unreleased duplicity 0.6.13
- New icon
+ Updated translations.
- Changes from version 17.91:
+ Rename Quit to Close
+ Bug Fixes:
- Fix a couple issues with Unity integration (like not showing
in launcher)
- Fix some broken label mnemonics in the preferences
+ Updated translations.
- Changes from version 17.90:
+ When entering an encryption password for the first time, it now
needs to be confirmed to avoid typo mistakes
+ First pass at optional Unity integration (instead of a status
icon)
+ Bug Fixes:
- Fixed bug with remote locations that made it impossible to
set a remote folder
- Fix a couple rare crashers
+ Updated translations.
- Changes from version 17.6:
+ Exclude Adobe flash cache directory by default
+ Add documentation for how to get your data back even if Déjà
Dup isn't working
+ Bug Fixes:
- Don't show error if both Déjà Dup and nautilus are trying to
mount a volume at the same time
- Allow removing multiple folders from the preferences at the
same time
- Handle more odd symlink-in-include-path situations
- Fix odd behavior (possibly a crash) when cancelling a backup
or restore
- Changes from version 17.5:
+ Add support for the Rackspace Cloud Files service
+ Use hostname in default Amazon S3 folder name
+ Add Downloads folder to default exclude list
+ Bug Fixes:
- Fix crash when changing backup location on first startup
- When browsing for a local folder, start the dialog in the
current folder setting
+ Updated translations.
- Changes from version 17.4:
+ Reorganize the backup location preferences to be more intuitive
+ Updated translations.
- Changes from version 17.3:
+ Bug fixes:
- Fix crash when changing backup location
- Fix date formats when restoring to be more consistent
+ Updated translations.
- Changes from version 17.2:
+ Add a "Restore Missing Files" interface, accessed via nautilus
+ Support GNOME Shell persistent notifications
+ Only calculate progress bar if a fresh backup is being made
+ Bug Fixes:
- If Duplicity looks like it's hitting a common ad-metadata
bug, clear cache and try again
- Changes from version 17.1:
+ Bug Fixes:
- If backup destination does not report free size, just
continue anyway
- Fix bug preventing sudo and encryption getting along
- Don't ask for root password when restoring into the user's
home folder
- Changes from version 17.0:
+ Use GSettings instead of gconf
+ Updated translations.
- For a complete list of changes between 16.1.1 and 18.0 see NEWS.
- Drop deja-dup-monitor_check_for_gtk.patch: fixed upstream. Also
remove related gnome-common BuildRequires and gnome-autogen.sh
call.
- Add intltool and perl-gettext BuildRequires.
- Drop pkgconfig(gconf-2.0) BuildRequires.
- Switch between gtk2/gtk3 based on favor_gtk2 macro:
+ Pass --without-gtk3/--with-gtk3 to configure.
+ Use appropriate pkgconfig() BuildRequires: gtk+-2.0 and
unique-1.0, or gtk+-3.0 and unique-3.0.
- Replace GConf2 schemas handling with GSettings schemas handling,
with %glib2_gsettings_schema_* macros, and remove
--disable-schemas-install from configure call.
-------------------------------------------------------------------
Sat Feb 12 17:09:17 CET 2011 - vuntz@opensuse.org

View File

@ -15,35 +15,37 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: deja-dup
Version: 16.1.1
Release: 3
Version: 18.1.1
Release: 1
# FIXME: check if python-cloudfiles is packaged, and if yes, uncomment Recommends
License: GPLv3+
Summary: Simple backup tool and frontend for duplicity
Url: https://launchpad.net/deja-dup
Group: Productivity/Archiving/Backup
Source0: %{name}-%{version}.tar.bz2
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
Patch0: deja-dup-monitor_check_for_gtk.patch
BuildRequires: fdupes
# Required for PATCH0
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: intltool
BuildRequires: perl-gettext
BuildRequires: update-desktop-files
BuildRequires: vala
BuildRequires: pkgconfig(gnome-keyring-1)
%if 0%{?favor_gtk2}
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(unique-1.0)
%else
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(unique-3.0)
%endif
BuildRequires: pkgconfig(libnautilus-extension)
# This would be an additional Option for deja-dup
#BuildRequires: pkgconfig(appindicator-0.1)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: update-desktop-files
BuildRequires: vala
Requires: duplicity
Recommends: %{name}-lang
%gconf_schemas_prereq
# Needed for Rackspace Cloud Files support, but not packaged :/
#Recommends: python-cloudfiles
%description
Déjà Dup is a simple backup tool. It hides the complexity of doing
@ -81,13 +83,14 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
%lang_package
%prep
%setup -q
%patch0
%build
NOCONFIGURE=1 gnome-autogen.sh
%configure --disable-static \
--disable-schemas-install \
%if 0%{?favor_gtk2}
--without-gtk3
%else
--with-gtk3
%endif
%__make %{?_smp_mflags}
%install
@ -100,25 +103,20 @@ find %{buildroot} -type f -name "*.la" -delete -print
# Localized man pages
for man in %{buildroot}%{_mandir}/*/man1/*; do
LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"`
echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang
echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang
echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{name}.man-lang
echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang.tmp
echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp
echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{name}.man-lang.tmp
done
sort -u %{name}.man-lang.tmp > %{name}.man-lang
rm %{name}.man-lang.tmp
# create symlinks for man pages
%fdupes -s %{buildroot}%{_mandir}
# create hardlinks for the rest
%fdupes %{buildroot}
%find_gconf_schemas
%clean
rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%if 0%{?suse_version} > 1130
%post
@ -133,7 +131,7 @@ rm -rf %{buildroot}
%icon_theme_cache_postun
%endif
%files -f %{name}.schemas_list -f %{name}.man-lang
%files -f %{name}.man-lang
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS
%dir %{_datadir}/gnome/
@ -151,14 +149,25 @@ rm -rf %{buildroot}
%{_libdir}/deja-dup/deja-dup-monitor
%{_datadir}/applications/deja-dup.desktop
%{_datadir}/applications/deja-dup-preferences.desktop
%{_datadir}/%{name}/
%{_datadir}/GConf/gsettings/deja-dup.convert
%{_datadir}/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml
%{_datadir}/icons/hicolor/scalable/actions/deja-dup-backup.svg
%{_datadir}/icons/hicolor/scalable/actions/deja-dup-restore.svg
%{_datadir}/icons/hicolor/scalable/apps/deja-dup.svg
%{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg
%{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg
%{_datadir}/icons/hicolor/*/apps/deja-dup.png
# Own the full directories as we don't even have those themes packaged
%{_datadir}/icons/ubuntu-mono-dark/
%{_datadir}/icons/ubuntu-mono-light/
%files -n nautilus-deja-dup
%defattr(-,root,root)
%if 0%{?favor_gtk2}
%{_libdir}/nautilus/extensions-2.0/libnautilus-deja-dup.so
%else
%{_libdir}/nautilus/extensions-3.0/libnautilus-deja-dup.so
%endif
%files lang -f %{name}.lang