Accepting request 27817 from GNOME:Factory

Copy from GNOME:Factory/file-roller based on submit request 27817 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/27817
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=45
This commit is contained in:
OBS User autobuild 2009-12-29 23:16:44 +00:00 committed by Git OBS Bridge
commit bdba265769
5 changed files with 17 additions and 36 deletions

View File

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

View File

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

View File

@ -1,28 +0,0 @@
commit 7f9b3b55a28ae2c5c39913f6137064931406c381
Author: Bastien Nocera <hadess@hadess.net>
Date: Tue Dec 1 15:18:25 2009 +0000
Fix dbus-glib-1 check in configure
DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean
up the check using PKG_CHECK_MODULES instead.
https://bugzilla.gnome.org/show_bug.cgi?id=603492
diff --git a/configure.ac b/configure.ac
index a7d31d9..9f48de0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit,
[AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],,
[enable_packagekit=yes])
if test "x$enable_packagekit" != "xno"; then
- if pkg-config dbus-glib-1; then
+ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no)
+ if test "x$has_dbus_glib" = "xyes"; then
AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer])
- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1`
- DBUS_LIBS = `pkg-config --libs dbus-glib-1`
else
enable_packagekit=no
fi

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Dec 22 04:51:48 CET 2009 - lmedinas@opensuse.org
- Update to version 2.29.3:
+ Allow to specify different package names using a configuration
file (bgo#603757)
+ Use the zip format to create cbz files
+ Use AES128 as encryption type when creating zip files with 7zip
+ Fixed wrong use of gdk_property_get (bgo#604535)
+ Updated translations.
- Drop file-roller-fix-build.patch: fixed upstream.
-------------------------------------------------------------------
Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package file-roller (Version 2.29.2)
# spec file for package file-roller (Version 2.29.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,15 +18,13 @@
Name: file-roller
Version: 2.29.2
Version: 2.29.3
Release: 1
License: GPLv2+
Summary: An Archive Manager for GNOME
Url: http://fileroller.sourceforge.net
Group: Productivity/Archiving/Compression
Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM file-roller-fix-build.patch vuntz@opensuse.org -- Taken from git
Patch0: file-roller-fix-build.patch
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: glib2-devel
@ -92,7 +90,6 @@ This package contains a plugin to integrate File Roller into Nautilus.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh