[qtparted] bump to new upstream release, various fixes and adjustments

Adam Williamson adamwill at fedoraproject.org
Fri Jul 27 02:20:05 UTC 2012 

commit 204fb6bf1dc9d9f50827198d4c601df6c659e7d1
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Jul 26 19:19:29 2012 -0700

    bump to new upstream release, various fixes and adjustments

 qtparted-0.4.5-PED_SECTOR_SIZE.patch |   13 -----
 qtparted-0.4.5-parted-version.patch  |   36 -------------
 qtparted-0.4.5-qp_libparted.patch    |   16 ------
 qtparted-desktop.patch               |   20 ++-----
 qtparted.qtpartedrc                  |   12 ++--
 qtparted.spec                        |   94 +++++++++++++---------------------
 6 files changed, 47 insertions(+), 144 deletions(-)
---
diff --git a/qtparted-desktop.patch b/qtparted-desktop.patch
index 5e1d251..72b403c 100644
--- a/qtparted-desktop.patch
+++ b/qtparted-desktop.patch
@@ -1,18 +1,8 @@
---- data/qtparted.desktop.orig	2005-07-06 14:34:10.000000000 -0500
-+++ data/qtparted.desktop	2006-10-28 12:27:59.000000000 -0500
-@@ -1,7 +1,7 @@
- [Desktop Entry]
--Exec=/usr/sbin/qtparted
-+Exec=qtparted
- Name=QTParted
--Icon=qtparted.xpm
-+Icon=qtparted.png
- Terminal=false
- Type=Application
- Comment=Application for partitioning a disk
-@@ -9,4 +9,4 @@
- Comment[fr]=Application pour partitionner un disque
- Comment[fi]=Kiintolevyn partitiointityökalu
+--- data/qtparted.desktop	2008-02-22 02:53:00.000000000 -0800
++++ data/qtparted.desktop.new	2012-07-26 16:06:27.317025012 -0700
+@@ -10,4 +10,4 @@
+ GenericName[fi]=Kiintolevyn partitiointityökalu
+ GenericName[de]=Partitionierungstool
  Encoding=UTF-8
 -Categories=Application;System;QT;
 +Categories=Utility;System;Qt;
diff --git a/qtparted.qtpartedrc b/qtparted.qtpartedrc
index ff7131c..e77cef2 100644
--- a/qtparted.qtpartedrc
+++ b/qtparted.qtpartedrc
@@ -1,10 +1,10 @@
 [General]
 layout=0
-mkfs.ext3=/sbin/mkfs.ext3
-mkfs.jfs=/sbin/mkfs.jfs
-mkfs.xfs=/sbin/mkfs.xfs
-mkntfs=missing
-mount=/bin/mount
-ntfsresize=missing
+mkfs.ext3=/usr/sbin/mkfs.ext3
+mkfs.jfs=/usr/sbin/mkfs.jfs
+mkfs.xfs=/usr/sbin/mkfs.xfs
+mkntfs=/usr/sbin/mkfs.ntfs
+mount=/usr/bin/mount
+ntfsresize=/usr/sbin/ntfsresize
 xfs_growfs=/usr/sbin/xfs_growfs
 
diff --git a/qtparted.spec b/qtparted.spec
index 948272f..286384f 100644
--- a/qtparted.spec
+++ b/qtparted.spec
@@ -1,45 +1,27 @@
 %define qtdir %(. %{_sysconfdir}/profile.d/qt.sh 2>/dev/null; echo $QTDIR)
 
 Name:           qtparted
-Version:        0.4.5
-Release:        31%{?dist}
-Summary:        Partition Magic clone written in C++ using the Qt toolkit
+Version:        0.6.0
+Release:        1%{?dist}
+Summary:        Graphical partition editor written in C++ using the Qt toolkit
 Group:          Applications/System
-License:        GPLv2
+# The COPYING file is a copy of the GPLv2, prefaced with an exception
+# for linking against Qt
+License:        GPLv2+ with exceptions
 URL:            http://qtparted.sourceforge.net/
-Source0:        http://download.sf.net/qtparted/%{name}-%{version}.tar.bz2
+Source0:        http://download.sf.net/qtparted/%{name}-%{version}.tar.xz
 Source1:        %{name}.pam
 Source2:        %{name}.consoleapp
 Source3:        %{name}.qtpartedrc
 Patch0:         %{name}-desktop.patch
-Patch1:         qtparted-0.4.5-PED_SECTOR_SIZE.patch
-# From http://patch-tracker.debian.org/patch/misc/view/qtparted/0.4.5-5/src/qp_libparted.cpp
-# Filed into upstreams bugtracker at:
-# http://sourceforge.net/tracker/?func=detail&aid=2857251&group_id=72497&atid=534714
-Patch2:         qtparted-0.4.5-qp_libparted.patch
-# http://qtparted.svn.sourceforge.net/viewvc/qtparted/trunk/qtparted/src/qp_libparted.cpp?view=patch&r1=250&r2=252&pathrev=252
-# with some whitespace changes (to match our older source).
-# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=585263
-Patch3:         qtparted-0.4.5-parted-version.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf
-BuildRequires:  automake
+BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
-BuildRequires:  perl
-BuildRequires:  qt3-designer
-BuildRequires:  qt3-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  parted-devel >= 1.6.6
-BuildRequires:  zlib-devel
-BuildRequires:  e2fsprogs
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  jfsutils
-BuildRequires:  xfsprogs
-BuildRequires:  libuuid-devel
+BuildRequires:  qt-devel
+# Can't build against 3.0 as it dropped ped_file_system_close, was
+# restored in 3.1
+BuildRequires:  parted-devel >= 3.1
 # Bugzilla 407151
 %ifnarch ppc ppc64
-BuildRequires:  ntfsprogs-devel
-BuildRequires:  ntfsprogs
 Requires:       ntfsprogs
 %endif
 Requires:       e2fsprogs
@@ -48,46 +30,32 @@ Requires:       usermode-gtk
 Requires:       xfsprogs
 
 %description
-QTParted is a Partition Magic clone written in C++ using the Qt toolkit.
+QTParted is a graphical partition editor written in C++ using the Qt toolkit.
 
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-. %{_sysconfdir}/profile.d/qt.sh
-
-%{__aclocal}
-%{__automake} --add-missing --gnu
-%{__perl} admin/am_edit
-%{__autoconf}
-
-%configure \
-  --with-log-dir=%{_localstatedir}/log \
-%ifarch ppc ppc64
-  --disable-ntfs \
-%endif
-  --disable-reiserfs
+%cmake .
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor fedora \
-  --mode 644 \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
-ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
+desktop-file-validate %{buildroot}/%{_datadir}/applications/qtparted.desktop
+
+ln -s %{_datadir}/qtparted/pics/qtparted_64.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/qtparted.png
 
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
+install -Dpm 644 doc/qtparted.1 $RPM_BUILD_ROOT%{_mandir}/man1/qtparted.1
+gzip $RPM_BUILD_ROOT%{_mandir}/man1/qtparted.1
+
 # PAM configuration
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_bindir}/qtparted $RPM_BUILD_ROOT%{_sbindir}/qtparted
 ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qtparted
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/qtparted
@@ -105,17 +73,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS doc/BUGS debian/changelog COPYING doc/README doc/TODO.txt
+%doc AUTHORS doc/BUGS ChangeLog COPYING doc/README doc/TODO.txt
 %config(noreplace) %{_sysconfdir}/pam.d/qtparted
 %config(noreplace) %{_sysconfdir}/security/console.apps/qtparted
 %config %{qtdir}/etc/settings/qtpartedrc
 %ghost %{qtdir}/etc/settings/.qtpartedrc.lock
 %{_bindir}/qtparted
 %{_sbindir}/qtparted
-%exclude %{_sbindir}/run_qtparted
 %{_datadir}/applications/*qtparted.desktop
 %{_datadir}/pixmaps/qtparted.png
-%exclude %{_datadir}/pixmaps/qtparted.xpm
+%{_datadir}/pixmaps/qtparted.xpm
 %dir %{_datadir}/qtparted
 %{_datadir}/qtparted/pics
 %dir %{_datadir}/qtparted/locale
@@ -124,13 +91,24 @@ rm -rf $RPM_BUILD_ROOT
 %lang(de) %{_datadir}/qtparted/locale/*_de.qm
 %lang(es) %{_datadir}/qtparted/locale/*_es.qm
 %lang(fr) %{_datadir}/qtparted/locale/*_fr.qm
+%lang(fi) %{_datadir}/qtparted/locale/*_fi.qm
 %lang(it) %{_datadir}/qtparted/locale/*_it.qm
 %lang(pl) %{_datadir}/qtparted/locale/*_pl.qm
 %lang(ru) %{_datadir}/qtparted/locale/*_ru.qm
+%lang(sv) %{_datadir}/qtparted/locale/*_sv.qm
 %lang(ua) %{_datadir}/qtparted/locale/*_ua.qm
 %{_mandir}/man1/qtparted.1*
 
 %changelog
+* Thu Jul 26 2012 Adam Williamson <awilliam at redhat.com> - 0.6.0-1
+- New upstream release 0.6.0
+- drop PED_SECTOR_SIZE.patch, qp_libparted.patch and
+  parted-version.patch: merged upstream
+- update qtpartedrc for /usr move and include ntfs utils
+- rediff desktop.patch
+- correct license to GPLv2+ with exceptions (not an upstream change,
+  just a correction in our downstream description)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

More information about the scm-commits mailing list