From bee2fbd9bb3dbff02cef5537061f9c7b3d39ab62 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jun 03 2013 12:27:26 +0000 Subject: import gnome-disk-utility-3.8.2-1.el7.src.rpm --- diff --git a/.gnome-disk-utility.metadata b/.gnome-disk-utility.metadata new file mode 100644 index 0000000..7197a76 --- /dev/null +++ b/.gnome-disk-utility.metadata @@ -0,0 +1 @@ +3378f92adaf1e62b644faebe32273b6ef99c6b26 SOURCES/gnome-disk-utility-3.8.2.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/gnome-disk-utility-3.8.2-format.patch b/SOURCES/gnome-disk-utility-3.8.2-format.patch new file mode 100644 index 0000000..63e92c5 --- /dev/null +++ b/SOURCES/gnome-disk-utility-3.8.2-format.patch @@ -0,0 +1,67 @@ +From eddba1d6138b2f9542dd7f1f4e08a2ac0f35c21a Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sun, 2 Jun 2013 10:35:39 +0200 +Subject: [PATCH] Fix -Wformat compiler warnings + +These were treated as errors with gcc 4.8 because of the use of -Werror. + +https://bugzilla.gnome.org/show_bug.cgi?id=701457 +--- + src/disks/gducreatediskimagedialog.c | 2 +- + src/disks/gdurestorediskimagedialog.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/disks/gducreatediskimagedialog.c b/src/disks/gducreatediskimagedialog.c +index 2817a89..8d1e092 100644 +--- a/src/disks/gducreatediskimagedialog.c ++++ b/src/disks/gducreatediskimagedialog.c +@@ -610,7 +610,7 @@ copy_span (int fd, + error)) + { + g_prefix_error (error, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_write, + offset); + goto out; +diff --git a/src/disks/gdurestorediskimagedialog.c b/src/disks/gdurestorediskimagedialog.c +index abfc4f5..09171e4 100644 +--- a/src/disks/gdurestorediskimagedialog.c ++++ b/src/disks/gdurestorediskimagedialog.c +@@ -587,7 +587,7 @@ copy_thread_func (gpointer user_data) + &error)) + { + g_prefix_error (&error, +- "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", ++ "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_read, + num_bytes_completed); + goto out; +@@ -595,7 +595,7 @@ copy_thread_func (gpointer user_data) + if (num_bytes_read != num_bytes_to_read) + { + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes", ++ "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes", + num_bytes_read, + num_bytes_completed, + num_bytes_to_read); +@@ -610,13 +610,13 @@ copy_thread_func (gpointer user_data) + goto copy_write_again; + + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", + num_bytes_read, + num_bytes_completed); + goto out; + } + +- /*g_print ("copied %" G_GUINT64_FORMAT " bytes at offset %" G_GUINT64_FORMAT "\n", ++ /*g_print ("copied %" G_GSIZE_FORMAT " bytes at offset %" G_GUINT64_FORMAT "\n", + (guint64) num_bytes_written, + num_bytes_completed);*/ + +-- +1.8.2.1 + diff --git a/SPECS/gnome-disk-utility.spec b/SPECS/gnome-disk-utility.spec new file mode 100644 index 0000000..70446c3 --- /dev/null +++ b/SPECS/gnome-disk-utility.spec @@ -0,0 +1,371 @@ +%define glib2_version 2.31.0 +%define gtk3_version 3.5.8 +%define udisks_version 2.1.0 +%define gnome_settings_daemon_version 3.7.3 + +# Only enable if using patches that touches configure.ac, +# Makefile.am or other build system related files +# +%define enable_autoreconf 0 + +Summary: Disks +Name: gnome-disk-utility +Version: 3.8.2 +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://git.gnome.org/browse/gnome-disk-utility +Source0: http://download.gnome.org/sources/gnome-disk-utility/3.8/%{name}-%{version}.tar.xz +# https://bugzilla.gnome.org/show_bug.cgi?id=701457 +Patch0: gnome-disk-utility-3.8.2-format.patch + +BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: gtk3-devel >= %{gtk3_version} +BuildRequires: gnome-settings-daemon-devel >= %{gnome_settings_daemon_version} +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: libudisks2-devel >= %{udisks_version} +BuildRequires: gnome-common +BuildRequires: intltool +BuildRequires: libsecret-devel +BuildRequires: systemd-devel +# for xsltproc +BuildRequires: libxslt +BuildRequires: docbook-style-xsl +BuildRequires: libpwquality-devel +BuildRequires: libcanberra-devel +BuildRequires: libdvdread-devel +BuildRequires: libnotify-devel + +Requires: gnome-icon-theme-symbolic +Requires: udisks2 + +Obsoletes: gnome-disk-utility-format +Obsoletes: nautilus-gdu +Obsoletes: gnome-disk-utility-libs +Obsoletes: gnome-disk-utility-devel +Obsoletes: gnome-disk-utility-ui-libs +Obsoletes: gnome-disk-utility-ui-devel +Obsoletes: gnome-disk-utility-nautilus + +%if 0%{?enable_autoreconf} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +%endif + +%description +This package contains the Disks and Disk Image Mounter applications. +Disks supports partitioning, file system creation, encryption, +fstab/crypttab editing, ATA SMART and other features + +%prep +%setup -q +%patch0 -p1 -b .format + +%build +%if 0%{?enable_autoreconf} +autoreconf +%endif +%configure +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.a + +desktop-file-install --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/gnome-disks.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applications/gnome-disk-image-mounter.desktop + +%find_lang %{name} + +%post +for d in hicolor HighContrast ; do + touch --no-create %{_datadir}/icons/$d &>/dev/null || : +done +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +update-desktop-database %{_datadir}/applications &> /dev/null +if [ $1 -eq 0 ] ; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + for d in hicolor HighContrast ; do + touch --no-create %{_datadir}/icons/$d &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/$d &>/dev/null || : + done +fi + +%posttrans +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +for d in hicolor HighContrast ; do + gtk-update-icon-cache %{_datadir}/icons/$d &>/dev/null || : +done + + +%files -f %{name}.lang +%{_bindir}/gnome-disks +%{_bindir}/gnome-disk-image-mounter +%{_datadir}/applications/gnome-disks.desktop +%{_datadir}/applications/gnome-disk-image-mounter.desktop +%{_datadir}/glib-2.0/schemas/org.gnome.Disks.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml + +%dir %{_datadir}/gnome-disk-utility +%{_datadir}/gnome-disk-utility/*.ui +%{_datadir}/icons/hicolor/*/apps/gnome-disks* +%{_datadir}/icons/HighContrast/*/apps/gnome-disks.png + +%{_mandir}/man1/* + +%{_libdir}/gnome-settings-daemon-3.0/gdu-sd-plugin.gnome-settings-plugin +%{_libdir}/gnome-settings-daemon-3.0/libgdu-sd.so + +%doc README AUTHORS NEWS COPYING + +%changelog +* Sun Jun 02 2013 Kalev Lember - 3.8.2-1 +- Update to 3.8.2 + +* Wed Mar 20 2013 Richard Hughes - 3.8.0-1 +- Update to 3.8.0 + +* Mon Feb 25 2013 Kalev Lember - 3.7.2-2 +- Require gnome-icon-theme-symbolic (#910982) + +* Tue Feb 19 2013 Richard Hughes - 3.7.2-1 +- Update to 3.7.2 + +* Wed Feb 13 2013 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 07 2013 David Zeuthen - 3.7.1-1%{?dist} +- Update to 3.7.1 + +* Fri Dec 21 2012 David Zeuthen - 3.7.0-4%{?dist} +- Add files for the new gnome-settings-daemon plug-in + +* Fri Dec 21 2012 David Zeuthen - 3.7.0-3%{?dist} +- BR gnome-settings-daemon 3.7.3 and rebuild without --disable-gsd-plugin + +* Tue Dec 18 2012 David Zeuthen - 3.7.0-2%{?dist} +- Adjust BRs + +* Tue Dec 18 2012 David Zeuthen - 3.7.0-1%{?dist} +- Update to 3.7.0 + +* Fri Oct 05 2012 David Zeuthen - 3.6.1-1%{?dist} +- Update to 3.6.1 + +* Sat Sep 22 2012 Kalev Lember - 3.6.0-1 +- Update to 3.6.0 +- Drop the -Werror patch; applied upstream +- Add glib-compile-schemas scriptlets +- Relicensed from LGPLv2+ to GPLv2+ + +* Fri Jul 27 2012 David Zeuthen - 3.5.3-2%{?dist} +- Avoid treating warnings as errors + +* Fri Jul 27 2012 David Zeuthen - 3.5.3-1%{?dist} +- Update to 3.5.3 + +* Thu Jul 19 2012 Fedora Release Engineering - 3.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jun 10 2012 Ville Skyttä - 3.5.2-2 +- Own the %%{_datadir}/gnome-disk-utility dir. + +* Tue Jun 05 2012 David Zeuthen - 3.5.2-1%{?dist} +- Update to 3.5.2 + +* Mon May 09 2012 David Zeuthen - 3.5.1-4%{?dist} +- BR docbook-style-xsl for man pages + +* Mon May 09 2012 David Zeuthen - 3.5.1-3%{?dist} +- BR libxslt (for xsltproc) + +* Mon May 09 2012 David Zeuthen - 3.5.1-2%{?dist} +- BR libgnome-keyring-devel and systemd-devel + +* Mon May 09 2012 David Zeuthen - 3.5.1-1%{?dist} +- Update to 3.5.1 + +* Mon Apr 30 2012 Richard Hughes - 3.4.1-1 +- Update to 3.4.1 + +* Mon Mar 26 2012 David Zeuthen - 3.4.0-1%{?dist} +- Update to release 3.4.0 + +* Mon Mar 05 2012 David Zeuthen - 3.3.93-1%{?dist} +- Update to release 3.3.93 + +* Thu Feb 23 2012 David Zeuthen - 3.3.92-1%{?dist} +- Update to release 3.3.92 + +* Mon Feb 06 2012 David Zeuthen - 3.3.91-1%{?dist} +- Update to release 3.3.91 + +* Tue Jan 24 2012 David Zeuthen - 3.3.90-3%{?dist} +- Require udisks2 package (for the daemon) (#783974) + +* Fri Jan 20 2012 David Zeuthen - 3.3.90-2%{?dist} +- Rebuild + +* Fri Jan 20 2012 David Zeuthen - 3.3.90-1%{?dist} +- Update to release 3.3.90 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 08 2011 Adam Jackson - 3.0.2-4 +- Rebuild to break bogus libpng dep + +* Mon Jul 11 2011 David Zeuthen - 3.0.2-3%{?dist} +- BR gtk-doc + +* Mon Jul 11 2011 David Zeuthen - 3.0.2-2%{?dist} +- BR gnome-common + +* Mon Jul 11 2011 David Zeuthen - 3.0.2-1%{?dist} +- Update to 3.0.2 + +* Sat May 07 2011 Christopher Aillon - 3.0.0-2 +- Update icon cache scriptlet + +* Mon Apr 4 2011 Matthias Clasen - 3.0.0-1 +- Update to 3.0.0 + +* Mon Mar 21 2011 Matthias Clasen - 2.91.7-1 +- Update to 2.91.7 + +* Mon Mar 14 2011 Tomas Bzatek - 2.91.6-5 +- Fix gnome-disk-utility-nautilus upgrade path + +* Tue Feb 22 2011 Tomas Bzatek - 2.91.6-4 +- Split nautilus extension into a separate package + +* Fri Feb 11 2011 Matthias Clasen - 2.91.6-3 +- Rebuild against newer gtk + +* Tue Feb 08 2011 Fedora Release Engineering - 2.91.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 2 2011 Matthias Clasen - 2.91.6-1%{?dist} +- Update to 2.91.6 + +* Wed Feb 2 2011 Matthias Clasen - 2.32.1-4%{?dist} +- Rebuild against newer gtk + +* Fri Jan 7 2011 Matthias Clasen - 2.32.1-3%{?dist} +- Rebuild against new gtk + +* Fri Dec 3 2010 Matthias Clasen - 2.32.1-2%{?dist} +- Rebuild against new gtk + +* Thu Nov 11 2010 Matthias Clasen - 2.32.1-1%{?dist} +- 2.32.1 + +* Fri Nov 5 2010 Matthias Clasen - 2.32.0-3%{?dist} +- Fix a problem with 'disk failure' notifications + +* Wed Nov 3 2010 Matthias Clasen - 2.32.0-2%{?dist} +- Rebuild against libnotify 0.7.0 + +* Tue Sep 28 2010 Matthias Clasen - 2.32.0-1%{?dist} +- Update to 2.32.0 + +* Wed Jun 16 2010 Matthias Clasen - 2.30.1-2%{?dist} +- Kill the scrollkeeper runtime dep + +* Mon Mar 22 2010 David Zeuthen - 2.30.1-1%{?dist} +- Update to 2.30.1 + +* Mon Mar 15 2010 David Zeuthen - 2.30.0-1%{?dist} +- Update to 2.30.0 + +* Tue Feb 23 2010 David Zeuthen - 2.29.90-1%{?dist} +- Update to 2.29.90 + +* Mon Feb 15 2010 David Zeuthen - 2.29.0-0.git20100215.3%{?dist} +- Add rarian-compat to BR + +* Mon Feb 15 2010 David Zeuthen - 2.29.0-0.git20100215.1%{?dist} +- Update to git snapshot +- Drop upstreamed patches + +* Mon Jan 18 2010 Tomas Bzatek - 2.29.0-0.git20100115.2%{?dist} +- Install missing include + +* Fri Jan 15 2010 David Zeuthen - 2.29.0-0.git20100115.1%{?dist} +- BR avahi-ui-devel + +* Fri Jan 15 2010 David Zeuthen - 2.29.0-0.git20100115%{?dist} +- Update to git snapshot + +* Wed Dec 2 2009 David Zeuthen - 2.29.0-0.git20091202%{?dist} +- Update to git snapshot that requires udisks instead of DeviceKit-disks +- The UI has been completely revamped + +* Fri Sep 18 2009 David Zeuthen - 2.28.0-2%{?dist} +- BR libatasmart-devel + +* Fri Sep 18 2009 David Zeuthen - 2.28.0-1%{?dist} +- Update to upstream release 2.28.0 +- Compared to previous releases, this release should whine less about SMART + +* Mon Aug 17 2009 David Zeuthen - 0.5-3%{?dist} +- Drop upstreamed patch + +* Mon Aug 17 2009 David Zeuthen - 0.5-2%{?dist} +- Rebuild + +* Mon Aug 17 2009 David Zeuthen - 0.5-1%{?dist} +- Update to release 0.5 + +* Mon Jul 27 2009 Matthias Clasen - 0.4-3%{?dist} +- Drop PolicyKit from .pc files, too + +* Fri Jul 24 2009 Fedora Release Engineering - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 19 2009 David Zeuthen - 0.4-1%{?dist} +- Update to release 0.4 + +* Fri May 01 2009 David Zeuthen - 0.3-1%{?dist} +- Upstream release 0.3 + +* Wed Apr 15 2009 David Zeuthen - 0.3-0.5.20090415git%{?dist} +- New snapshot + +* Sun Apr 12 2009 David Zeuthen - 0.3-0.4.20090412git%{?dist} +- New snapshot + +* Fri Apr 10 2009 Matthias Clasen - 0.3-0.3.20090406git%{?dist} +- Don't own directories that belong to hicolor-icon-theme + +* Wed Apr 08 2009 David Zeuthen - 0.3-0.2.20090406git%{?dist} +- Fix bug in detecting when a PolicyKit error is returned (#494787) + +* Mon Apr 06 2009 David Zeuthen - 0.3-0.1.20090406git%{?dist} +- New snapshot + +* Wed Mar 04 2009 David Zeuthen - 0.2-2%{?dist} +- Don't crash when changing the LUKS passphrase on a device + +* Mon Mar 02 2009 David Zeuthen - 0.2-1%{?dist} +- Update to version 0.2 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.1-0.git20080720.2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 27 2009 Matthias Clasen 0.1-0.git20080720.2%{?dist} +- Rebuild for pkgconfig provides + +* Sun Nov 23 2008 Matthias Clasen 0.1-0.git20080720.1%{?dist} +- Improve %%summary and %%description + +* Fri Jul 20 2008 David Zeuthen - 0.1-0.git20080720%{?dist} +- Initial Packaging