Accepting request 27381 from home:lmedinas:branches:GNOME:Factory

Copy from home:lmedinas:branches:GNOME:Factory/file-roller via accept of submit request 27381 revision 2.
Request was accepted with message:
Thanks, but make sure to remove patches ;-)

OBS-URL: https://build.opensuse.org/request/show/27381
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=58
This commit is contained in:
Vincent Untz 2009-12-22 12:36:59 +00:00 committed by Git OBS Bridge
parent 7db581ca2a
commit 93b9bf4ed2
5 changed files with 103 additions and 33 deletions

View File

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

View File

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

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,47 @@
-------------------------------------------------------------------
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 upstreamed.
-------------------------------------------------------------------
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
- Update to version 2.28.1:
+ Updated translations.
-------------------------------------------------------------------
Tue Sep 22 13:59:46 CEST 2009 - dimstar@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package file-roller (Version 2.28.0)
# spec file for package file-roller (Version 2.29.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,9 +18,9 @@
Name: file-roller
Version: 2.28.0
Version: 2.29.3
Release: 1
License: GPL v2 or later
License: GPLv2+
Summary: An Archive Manager for GNOME
Url: http://fileroller.sourceforge.net
Group: Productivity/Archiving/Compression
@ -34,6 +34,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
@ -68,31 +70,21 @@ DocDir: %{_defaultdocdir}
%description
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: GPLv2+
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
@ -100,6 +92,7 @@ like tar and zip. The supported file types are:
translation-update-upstream
%build
NOCONFIGURE=1 gnome-autogen.sh
%configure\
--disable-schemas-install\
--disable-scrollkeeper
@ -107,10 +100,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 +128,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