rpms/qtparted/devel .cvsignore, 1.2, 1.3 qtparted-desktop.patch, 1.1, 1.2 qtparted.qtpartedrc, 1.1, 1.2 qtparted.spec, 1.2, 1.3 sources, 1.2, 1.3 qtparted-df.patch, 1.1, NONE qtparted-dfloc.patch, 1.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Nov 30 09:27:23 UTC 2004
Changeset from: mschwendt
Update of /cvs/extras/rpms/qtparted/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv31671
Modified Files:
.cvsignore qtparted-desktop.patch qtparted.qtpartedrc
qtparted.spec sources
Removed Files:
qtparted-df.patch qtparted-dfloc.patch
Log Message:
Sync with missing qtparted-0.4.4-0.fdr.1.2.src.rpm - see fedora.us bug 1682 comment 3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:17:31 -0000 1.2
+++ .cvsignore 30 Nov 2004 09:27:21 -0000 1.3
@@ -1 +1 @@
-qtparted-0.3.2.tar.bz2
+qtparted-0.4.4.tar.bz2
qtparted-desktop.patch:
Index: qtparted-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted-desktop.patch 8 Nov 2004 05:17:31 -0000 1.1
+++ qtparted-desktop.patch 30 Nov 2004 09:27:21 -0000 1.2
@@ -1,20 +1,12 @@
---- data/qtparted.desktop.orig 2003-06-12 19:39:06.000000000 +0300
-+++ data/qtparted.desktop 2003-07-01 22:15:38.000000000 +0300
-@@ -1,9 +1,12 @@
+--- data/qtparted.desktop.orig 2004-04-24 19:41:27.000000000 +0300
++++ data/qtparted.desktop 2004-05-21 00:36:57.955313448 +0300
+@@ -1,7 +1,7 @@
[Desktop Entry]
--Exec=kdesu qtparted
+-Exec=gksu /usr/sbin/qtparted
+Exec=qtparted
Name=QTParted
--Icon=qtparted
--Terminal=0
-+Icon=qtparted.xpm
-+Terminal=false
+-Icon=qtparted.xpm
++Icon=qtparted.png
+ Terminal=false
Type=Application
Comment=Application for partitioning a disk
- Comment[it]=Applicazione per il partizionamento di un disco
--Comment[fr]=Application pour partitionner un disque
-\ No newline at end of file
-+Comment[fr]=Application pour partitionner un disque
-+Comment[fi]=Kovalevyn partitiointityökalu
-+Encoding=UTF-8
-+Categories=Application;System;QT;
Index: qtparted.qtpartedrc
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.qtpartedrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.qtpartedrc 8 Nov 2004 05:17:31 -0000 1.1
+++ qtparted.qtpartedrc 30 Nov 2004 09:27:21 -0000 1.2
@@ -2,8 +2,9 @@
layout=0
mkfs.ext3=/sbin/mkfs.ext3
mkfs.jfs=/sbin/mkfs.jfs
-mkfs.xfs=missing
+mkfs.xfs=/sbin/mkfs.xfs
mkntfs=missing
+mount=/bin/mount
ntfsresize=missing
-qtparted_df=/usr/libexec/qtparted_df
+xfs_growfs=/usr/sbin/xfs_growfs
Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtparted.spec 8 Nov 2004 05:17:37 -0000 1.2
+++ qtparted.spec 30 Nov 2004 09:27:21 -0000 1.3
@@ -1,110 +1,110 @@
%define qtdir %(. %{_sysconfdir}/profile.d/qt.sh 2>/dev/null; echo $QTDIR)
Name: qtparted
-Version: 0.3.2
-Release: 0.fdr.5.1
+Version: 0.4.4
+Release: 0.fdr.1.2
Epoch: 0
Summary: Partition Magic clone written in C++ using the Qt toolkit
Group: Applications/System
License: GPL
URL: http://qtparted.sourceforge.net/
-Source0: http://dl.sf.net/qtparted/qtparted-0.3.2.tar.bz2
+Source0: http://download.sourceforge.net/qtparted/qtparted-0.4.4.tar.bz2
Source1: %{name}.pam
Source2: %{name}.consoleapp
Source3: %{name}.qtpartedrc
Patch0: %{name}-desktop.patch
-Patch1: %{name}-dfloc.patch
-Patch2: %{name}-df.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt-devel >= 1:3.1.0, parted-devel >= 0:1.6.3, XFree86-devel
+BuildRequires: qt-devel >= 1:3.1.0, parted-devel >= 0:1.6.6, XFree86-devel
BuildRequires: desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires: zlib-devel, libjpeg-devel
-Requires: usermode-gtk, e2fsprogs, jfsutils
+BuildRequires: zlib-devel, libjpeg-devel, xfsprogs
+Requires: usermode-gtk, e2fsprogs, jfsutils, xfsprogs
%description
QTParted is a Partition Magic clone written in C++ using the Qt toolkit.
-# -----------------------------------------------------------------------------
%prep
%setup -q
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-# -----------------------------------------------------------------------------
%build
export QTDIR="%{qtdir}"
-PATH="$PATH:/sbin" %configure \
- --with-xinerama \
+%configure \
--with-log-dir=%{_localstatedir}/log \
--disable-reiserfs \
- --disable-ntfs \
- --disable-xfs
+ --disable-ntfs
make %{?_smp_mflags}
-# -----------------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
-%makeinstall
-
-desktop-file-install --vendor fedora --mode 0644 \
+desktop-file-install \
+ --vendor fedora \
+ --mode 644 \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
$RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/qtparted.png
# PAM configuration
-install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qtparted
-install -p -D -m 0644 %{SOURCE1} \
+install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/qtparted
-install -p -D -m 0644 %{SOURCE2} \
+install -Dpm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/qtparted
-install -D -p -m 0644 %{SOURCE3} \
+# Default configuration
+install -Dpm 0644 %{SOURCE3} \
$RPM_BUILD_ROOT%{qtdir}/etc/settings/qtpartedrc
touch $RPM_BUILD_ROOT%{qtdir}/etc/settings/.qtpartedrc.lock
-chmod 0600 $RPM_BUILD_ROOT%{qtdir}/etc/settings/.qtpartedrc.lock
+chmod 600 $RPM_BUILD_ROOT%{qtdir}/etc/settings/.qtpartedrc.lock
-# -----------------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
-# -----------------------------------------------------------------------------
%files
%defattr(-,root,root,-)
-%doc AUTHORS doc/BUGS debian/changelog COPYING doc/README TODO
-%config(noreplace) %{_sysconfdir}/pam.d/*
-%config(noreplace) %{_sysconfdir}/security/console.apps/*
+%doc AUTHORS doc/BUGS debian/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}/*
-%{_sbindir}/*
-%{_libexecdir}/*
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/*
+%{_bindir}/qtparted
+%{_sbindir}/qtparted
+%exclude %{_sbindir}/run_qtparted
+%{_datadir}/applications/*qtparted.desktop
+%{_datadir}/pixmaps/qtparted.png
+%exclude %{_datadir}/pixmaps/qtparted.xpm
%dir %{_datadir}/qtparted
%{_datadir}/qtparted/pics
%dir %{_datadir}/qtparted/locale
+%lang(ca) %{_datadir}/qtparted/locale/*_ca.qm
%lang(cs) %{_datadir}/qtparted/locale/*_cs.qm
%lang(de) %{_datadir}/qtparted/locale/*_de.qm
%lang(es) %{_datadir}/qtparted/locale/*_es.qm
%lang(fr) %{_datadir}/qtparted/locale/*_fr.qm
%lang(it) %{_datadir}/qtparted/locale/*_it.qm
%lang(pl) %{_datadir}/qtparted/locale/*_pl.qm
-%{_mandir}/*/*
+%lang(ru) %{_datadir}/qtparted/locale/*_ru.qm
+%lang(ua) %{_datadir}/qtparted/locale/*_ua.qm
+%{_mandir}/man1/qtparted.1*
-# -----------------------------------------------------------------------------
%changelog
+* Fri May 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.4-0.fdr.1
+- Update to 0.4.4.
+- Specfile cleanup.
+
* Sun Jul 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.5
- Export $QTDIR before running %%configure.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:17:31 -0000 1.2
+++ sources 30 Nov 2004 09:27:21 -0000 1.3
@@ -1 +1 @@
-fad16013cb070c8cac0f820489cbf75f qtparted-0.3.2.tar.bz2
+b8253bf21eaebe1f2c22b50462e8046c qtparted-0.4.4.tar.bz2
--- qtparted-df.patch DELETED ---
--- qtparted-dfloc.patch DELETED ---
More information about the fedora-extras-commits
mailing list