diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch deleted file mode 100644 index 42dada3..0000000 --- a/file-roller-fix-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 7f9b3b55a28ae2c5c39913f6137064931406c381 -Author: Bastien Nocera -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 diff --git a/file-roller.changes b/file-roller.changes index 36b51a5..2815ce4 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -8,7 +8,7 @@ Tue Dec 22 04:51:48 CET 2009 - lmedinas@opensuse.org + 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 upstreamed. +- Drop file-roller-fix-build.patch: fixed upstream. ------------------------------------------------------------------- Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org