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

Copy from home:vuntz:branches:GNOME:Factory/file-roller via accept of submit request 25552 revision 2.
Request was accepted with message:
Accepting

OBS-URL: https://build.opensuse.org/request/show/25552
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=55
This commit is contained in:
Vincent Untz 2009-12-04 22:48:51 +00:00 committed by Git OBS Bridge
parent 2dd714dff5
commit 94081afeb4
5 changed files with 88 additions and 32 deletions

View File

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

View File

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

View File

@ -0,0 +1,28 @@
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,29 @@
-------------------------------------------------------------------
Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.2:
+ New features and user visible changes:
- Use the eggfileformatchooser widget to select the file format
+ Updated translations.
- Changes from version 2.29.1:
+ New features and user visible changes
- Install the missing packages if a command is not available
(bgo#482560)
+ Bugs fixed:
- bgo#590606: drag and drop bug makes file-roller UI unusable
as a whole
- bgo#600131: encrypt_header is left enabled when creating zip
archives
- bgo#580624: Visual refresh issues while browsing into the
directories included in the archive
- bgo#326017: 4th and 5th mouse buttons should control back /
forward
- bgo#590027: file-roller will not update files
+ Updated translations.
- Add file-roller-fix-build.patch to fix build.
- Create a nautilus-file-roller subpackage, to make file-roller
installable without nautilus.
-------------------------------------------------------------------
Sat Nov 14 02:17:26 CET 2009 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package file-roller (Version 2.28.1)
# spec file for package file-roller (Version 2.29.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,13 +18,16 @@
Name: file-roller
Version: 2.28.1
Version: 2.29.2
# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory
Release: 1
License: GPL v2 or later
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
@ -34,6 +37,8 @@ BuildRequires: intltool
BuildRequires: nautilus-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
# Needed for patch0 file-roller-fix-build.patch
BuildRequires: gnome-common
Requires: %{name}-lang = %{version}
# Formats that we really want to support by default
Requires: bzip2
@ -66,40 +71,32 @@ DocDir: %{_defaultdocdir}
%gconf_schemas_prereq
%description
File Roller is an archive manager for GNOME. With it, you can create
File Roller is an archive manager for GNOME. With it, you can create
and modify archives, view the contents of an archive, view a file
contained in the archive, and extract files from the archive. File
Roller is a front-end (a graphical interface) for archiving programs
like tar and zip. The supported file types are:
contained in the archive, and extract files from the archive.
* Tar archives uncompressed (.tar) or compressed with
%package -n nautilus-file-roller
License: GPL v2 or later
Summary: An Archive Manager for GNOME - Nautilus extension
Group: Productivity/Archiving/Compression
Requires: %{name} = %{version}
Supplements: packageand(file-roller:nautilus)
- gzip (.tar.gz, .tgz)
%description -n nautilus-file-roller
File Roller is an archive manager for GNOME. With it, you can create
and modify archives, view the contents of an archive, view a file
contained in the archive, and extract files from the archive.
- bzip (.tar.bz, .tbz)
- bzip2 (.tar.bz2, .tbz2)
- compress (.tar.Z, .taz)
- lzop (.tar.lzo, .tzo)
* Zip archives (.zip)
* Jar archives (.jar, .ear, .war)
* Lha archives (.lzh)
* Rar archives (.rar)
* Single files compressed with gzip, bzip, bzip2, compress, lzop
This package contains a plugin to integrate File Roller into Nautilus.
%lang_package
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh
%configure\
--disable-schemas-install\
--disable-scrollkeeper
@ -107,10 +104,12 @@ translation-update-upstream
%install
%makeinstall
# %if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
# %endif
%suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
rm %{buildroot}%{_libdir}/*/*/*.*a
%fdupes %{buildroot}
@ -133,15 +132,18 @@ if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%files -f %{name}.lst
%files -f %{name}.schemas_list
%defattr(-, root, root)
%doc AUTHORS NEWS README COPYING
%{_bindir}/file-roller
%{_libexecdir}/file-roller
%{_libexecdir}/file-roller/
%{_datadir}/applications/*.desktop
%{_datadir}/file-roller
%{_datadir}/file-roller/
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%files -n nautilus-file-roller
%defattr(-, root, root)
%{_libdir}/nautilus/extensions-2.0/*.so
%files lang -f %name.lang