Accepting request 107203 from GNOME:Apps

Pushing some G:A changes

OBS-URL: https://build.opensuse.org/request/show/107203
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gparted?expand=0&rev=5
This commit is contained in:
Stephan Kulow 2012-02-28 13:12:57 +00:00 committed by Git OBS Bridge
parent 572aea0253
commit 57be625346
5 changed files with 42 additions and 58 deletions

View File

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

3
gparted-0.12.0.tar.bz2 Normal file
View File

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

View File

@ -1,44 +0,0 @@
commit e1df6dbb31c5a1f6f8cda97503cf77cf1be3e33c
Author: Vincent Untz <vuntz@gnome.org>
Date: Fri Jan 6 15:23:43 2012 +0100
build: Correctly link to gthread
https://bugzilla.gnome.org/show_bug.cgi?id=667412
diff --git a/configure.in b/configure.in
index b44584a..774192a 100644
--- a/configure.in
+++ b/configure.in
@@ -180,6 +180,11 @@ int main ()
LIBS="$LIBS_save"
+dnl gthread
+PKG_CHECK_MODULES([GTHREAD], [gthread-2.0])
+AC_SUBST([GTHREAD_LIBS])
+AC_SUBST([GTHREAD_CFLAGS])
+
dnl GTKMM
PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 > 2.8])
AC_SUBST([GTKMM_LIBS])
diff --git a/src/Makefile.am b/src/Makefile.am
index f3f5cf6..d3b0b5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = \
+ $(GTHREAD_CFLAGS) \
$(GTKMM_CFLAGS) \
-DGPARTED_DATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
@@ -64,7 +65,7 @@ gpartedbin_SOURCES = \
ufs.cc \
xfs.cc
-gpartedbin_LDFLAGS = -lparted -lgthread-2.0
+gpartedbin_LDFLAGS = -lparted
-gpartedbin_LDADD = $(GTKMM_LIBS)
+gpartedbin_LDADD = $(GTHREAD_LIBS) $(GTKMM_LIBS)

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Thu Feb 23 17:32:25 UTC 2012 - vuntz@opensuse.org
- Update to version 0.12.0:
+ Key changes include:
- Add support for nilfs2 including resizing (bgo#642842)
- Add ability to change UUID (bgo#667278)
- Add read-only support for LVM PVs (bgo#160787)
- Enable GPT expansion when growing RAID (bgo#566935)
+ Bug Fixes:
- Prevent unitialized OperationDetail member access
- Create common methods for mount and umount in btrfs, jfs,
nilfs2, and xfs
- Don't ignore any errors resizing btrfs on Linux >= 3.2
(bgo#669389)
- Display pop-up dialog on libparted exceptions
- Reduce graphic processing requirement for pulse bar
(deb#499193, deb#519764)
- Fix detection of multiple SW RAID (md) devices (bgo#668486)
- Fix build to correctly link to gthread (bgo#667412)
- Fix long scan problem when BIOS floppy setting incorrect
(bgo#667511, lp#910379)
- Enhance documentation for UUIDs and copying partitions
(bgo#608308)
- Fix en_CA parameter missing percent sign translation error
(bgo#660180)
- Avoid warning display when moving start of extended partition
- Increase FAT32 minimum size to 33 MiB (bgo#668491)
- Fix regression when shrinking, moving and copying swap
(bgo#670017)
+ Updated translations.
- Drop gparted-fix-thread-linking.patch: fixed upstream.
- Drop automake and libtool BuildRequires, as well as call to
autoreconf: they were only needed for above patch.
- Add nilfs-utils Requires for nilfs2 support.
-------------------------------------------------------------------
Fri Jan 6 14:16:50 UTC 2012 - vuntz@opensuse.org

View File

@ -17,17 +17,13 @@
Name: gparted
Version: 0.11.0
Version: 0.12.0
Release: 0
Summary: Gnome Partition Editor
License: GPL-2.0
Group: System/Filesystems
Url: http://gparted.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/gparted/gparted/gparted-0.11.0/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gparted-fix-thread-linking.patch vuntz@opensuse.org -- Fix build system to correctly link to thread libraries
Patch0: gparted-fix-thread-linking.patch
# needed for patch0
BuildRequires: automake
Source0: http://downloads.sourceforge.net/project/gparted/gparted/gparted-0.12.0/%{name}-%{version}.tar.bz2
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -37,8 +33,6 @@ BuildRequires: gnome-doc-utils-devel
BuildRequires: gtkmm2-devel
BuildRequires: intltool
BuildRequires: libglademm-devel
# needed for patch0
BuildRequires: libtool
BuildRequires: parted-devel
BuildRequires: perl-XML-Parser
BuildRequires: scrollkeeper
@ -49,6 +43,7 @@ Requires: e2fsprogs
Requires: hfsutils
Requires: jfsutils
Requires: mtools
Requires: nilfs-utils
Requires: ntfsprogs
Requires: parted
Requires: reiserfs
@ -67,11 +62,8 @@ copying data residing on hard disks and mirroring one partition with another
%lang_package
%prep
%setup -q
%patch0 -p1
%build
# needed for patch0
autoreconf -fi
export GKSUPROG="/usr/bin/xdg-su -c"
%configure \
--disable-scrollkeeper