Hello community, here is the log from the commit of package imagewriter for openSUSE:Factory checked in at 2014-12-25 23:20:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imagewriter (Old) and /work/SRC/openSUSE:Factory/.imagewriter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imagewriter" Changes: -------- --- /work/SRC/openSUSE:Factory/imagewriter/imagewriter.changes 2014-05-27 12:00:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.imagewriter.new/imagewriter.changes 2014-12-25 23:20:19.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 9 00:10:34 UTC 2014 - malcolmle...@opensuse.org + +- Update to latest git release 7998f7c: + + Man page added. + + Desktop file fixes to remove path to exec. + + Update to FSF address in COPYING. + + Cleanup of build process in cmake project file and rpm spec + file. + +------------------------------------------------------------------- Old: ---- imagewriter-1.10.1396965491.a4dcffa.tar.xz New: ---- imagewriter-1.10.1417937728.7998f7c.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imagewriter.spec ++++++ --- /var/tmp/diff_new_pack.BoGXsO/_old 2014-12-25 23:20:21.000000000 +0100 +++ /var/tmp/diff_new_pack.BoGXsO/_new 2014-12-25 23:20:21.000000000 +0100 @@ -1,14 +1,19 @@ # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# spec file for package imagewriter # -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. -Url: https://github.com/openSUSE/imagewriter -Name: imagewriter -BuildRequires: gcc-c++, xz +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# %if 0%{?rhel_version} == 600 %define dist el6 @@ -56,32 +61,39 @@ %define definedbackend USEUDISKS2 %endif -Summary: Utility for writing disk images to USB keys -Version: 1.10.1396965491.a4dcffa +Name: imagewriter +Version: 1.10.1417937728.7998f7c Release: 0 -Group: Hardware/Other +Summary: Utility for writing disk images to USB keys License: GPL-2.0 -Source: imagewriter-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{breq} %{backend} +Group: Hardware/Other +Url: https://github.com/openSUSE/imagewriter +Source0: imagewriter-%{version}.tar.xz +BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme +BuildRequires: %{breq} %{backend} +BuildRequires: xz Requires: xdg-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A graphical utility for writing raw disk images & hybrid ISOs to USB keys +A graphical utility for writing raw disk images & hybrid ISOs to USB keys. %prep -%setup +%setup -q %build -%{qmake} PREFIX=%{buildroot}/%{_prefix} DEFINES=%{definedbackend} imagewriter.pro -make buildroot=%{buildroot} CFLAGS="%{optflags} -DKIOSKHACK" +# Create qmake cache file for building and use optflags. +cat > .qmake.cache <<EOF +PREFIX=%{_prefix} +QMAKE_CXXFLAGS_RELEASE += "%{optflags} -DKIOSKHACK" +DEFINES=%{definedbackend} +EOF +%{qmake} +make %install -# I don't know why 'make install' ignores the binary when built in OBS -install -d %{buildroot}/usr/bin -install -m 755 -p imagewriter %{buildroot}/%{_bindir} -make install +make INSTALL_ROOT=%{buildroot} install %if 0%{?suse_version} %suse_update_desktop_file imagewriter %endif @@ -98,9 +110,14 @@ %files %defattr(-,root,root) +%doc COPYING %{_bindir}/imagewriter %{_datadir}/applications/imagewriter.desktop %{_datadir}/icons/hicolor/*/apps/imagewriter.* -%doc COPYING +%if 0%{?mandriva_version} +%{_mandir}/man1/imagewriter.1.* +%else +%{_mandir}/man1/imagewriter.1%{?ext_man} +%endif %changelog ++++++ imagewriter-1.10.1396965491.a4dcffa.tar.xz -> imagewriter-1.10.1417937728.7998f7c.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imagewriter-1.10.1396965491.a4dcffa/COPYING new/imagewriter-1.10.1417937728.7998f7c/COPYING --- old/imagewriter-1.10.1396965491.a4dcffa/COPYING 2014-04-14 11:39:40.000000000 +0200 +++ new/imagewriter-1.10.1417937728.7998f7c/COPYING 2014-12-09 01:04:14.000000000 +0100 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.1 new/imagewriter-1.10.1417937728.7998f7c/imagewriter.1 --- old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.1 1970-01-01 01:00:00.000000000 +0100 +++ new/imagewriter-1.10.1417937728.7998f7c/imagewriter.1 2014-12-09 01:04:14.000000000 +0100 @@ -0,0 +1,55 @@ +.TH "imagewriter" "1" "06. Dec. 2014" "man page by Malcolm J Lewis" "" +.SH NAME +.B +imagewriter +- Utility for writing disk images to USB keys. +.P +.SH SYNOPSIS +.B +imagewriter +.I +[OPTIONS] +.P +.SH DESCRIPTION +A graphical utility for writing raw disk images & hybrid ISOs to USB keys + +.SH OPTIONS + +.B +-d <device> +Specify a device, for example: /dev/sdc + +.B +-f <raw file> +Specify the file to write. + +.B +-h, -help +Display help and exit + +.B +-k +Operate in "kiosk mode", only listing disks smaller than 200GB. + +.B +-l +List valid USB devices. + +.B +-m +Maximize the window. + +.B +-u +Operate in unsafe mode, listing all disks, not just removable ones. + +.B +-v +Displays version and author information and exit. + +.SH AUTHOR +Matt Barringer <mbarrin...@suse.de> +.SH HOMEPAGE +https://github.com/openSUSE/imagewriter +.SH REPORTING BUGS +https://github.com/openSUSE/imagewriter/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.desktop new/imagewriter-1.10.1417937728.7998f7c/imagewriter.desktop --- old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.desktop 2014-04-14 11:39:40.000000000 +0200 +++ new/imagewriter-1.10.1417937728.7998f7c/imagewriter.desktop 2014-12-09 01:04:14.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Categories=System;Utility;Archiving; -Exec=/usr/bin/imagewriter %f +Exec=imagewriter %f Icon=imagewriter Name=SUSE Studio Imagewriter GenericName=USB key writer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.pro new/imagewriter-1.10.1417937728.7998f7c/imagewriter.pro --- old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.pro 2014-04-14 11:39:40.000000000 +0200 +++ new/imagewriter-1.10.1417937728.7998f7c/imagewriter.pro 2014-12-09 01:04:14.000000000 +0100 @@ -3,9 +3,10 @@ # ##################################################################### unix:isEmpty(PREFIX):PREFIX = /usr/local TEMPLATE = app -TARGET = +TARGET = imagewriter DEPENDPATH += . INCLUDEPATH += . +DESTDIR += . VERSION=1.10 DEFINES += APP_VERSION=\\\"$$VERSION\\\" @@ -44,6 +45,7 @@ DISTFILE_MAKEDIR = .tmp/imagewriter-$$VERSION DISTFILE_EXTRAFILES = $$RESOURCES \ COPYING \ + imagewriter.1 \ imagewriter.pro \ README.md \ INSTALL \ @@ -82,13 +84,13 @@ cd \ .. -imagewriter.path = $$PREFIX/bin -imagewriter.files = imagewriter -INSTALLS += imagewriter \ +INSTALLS += target \ icon32 \ icon64 \ icon128 \ - desktop + desktop \ + manpage +target.path = $$PREFIX/bin desktop.path = $$PREFIX/share/applications/ desktop.files += imagewriter.desktop icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps @@ -97,4 +99,6 @@ icon64.files += icons/64x64/imagewriter.png icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps icon128.files += icons/128x128/imagewriter.png +manpage.path =$$PREFIX/share/man/man1 +manpage.files += imagewriter.1 RESOURCES += imagewriter.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.spec new/imagewriter-1.10.1417937728.7998f7c/imagewriter.spec --- old/imagewriter-1.10.1396965491.a4dcffa/imagewriter.spec 2014-04-14 11:39:40.000000000 +0200 +++ new/imagewriter-1.10.1417937728.7998f7c/imagewriter.spec 2014-12-09 01:04:14.000000000 +0100 @@ -1,21 +1,25 @@ # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# spec file for package imagewriter # -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. -# needsrootforbuild -Url: https://github.com/mbarringer/imagewriter -Name: imagewriter -BuildRequires: gcc-c++ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# -%if 0%{?rhel_version} == 600 +%if 0%{?rhel_version} == 600 %define dist el6 %define breq qt-devel %define backend hal-devel - %define qmake /usr/bin/qmake-qt4 + %define qmake /usr/bin/qmake-qt4 %define lrelease /usr/bin/lrelease-qt4 %define definedbackend USEHAL %endif @@ -23,7 +27,7 @@ %if 0%{?fedora} %define breq qt4-devel %define backend udisks2 - %define qmake /usr/bin/qmake-qt4 + %define qmake /usr/bin/qmake-qt4 %define lrelease /usr/bin/lrelease-qt4 %define definedbackend USEUDISKS2 %endif @@ -31,14 +35,14 @@ %if 0%{?mandriva_version} %define breq libqt4-devel %define backend hal-devel - %define qmake /usr/lib/qt4/bin/qmake + %define qmake /usr/lib/qt4/bin/qmake %define lrelease /usr/lib/qt4/bin/lrelease %define definedbackend USEHAL %endif %if 0%{?suse_version} %define breq libqt4-devel update-desktop-files - %define qmake /usr/bin/qmake + %define qmake /usr/bin/qmake %define lrelease /usr/bin/lrelease %endif @@ -57,46 +61,63 @@ %define definedbackend USEUDISKS2 %endif -Summary: SUSE Imagewriter -Version: 1.10 +Name: imagewriter +Version: 1.10.1396965491.a4dcffa Release: 0 -Group: Hardware/Other +Summary: Utility for writing disk images to USB keys License: GPL-2.0 -Source: imagewriter-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Group: Hardware/Other +Url: https://github.com/openSUSE/imagewriter +Source0: imagewriter-%{version}.tar.xz +BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: %{breq} %{backend} +BuildRequires: xz +Requires: xdg-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-build + %description -A graphical utility for writing raw disk images & hybrid isos to USB keys +A graphical utility for writing raw disk images & hybrid ISOs to USB keys. %prep -%setup +%setup -q %build -%{qmake} PREFIX=$RPM_BUILD_ROOT/%{_prefix} DEFINES=%{definedbackend} imagewriter.pro -make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS -DKIOSKHACK" +# Create qmake cache file for building and use optflags. +cat > .qmake.cache <<EOF +PREFIX=%{_prefix} +QMAKE_CXXFLAGS_RELEASE += "%{optflags} -DKIOSKHACK" +DEFINES=%{definedbackend} +EOF +%{qmake} +make %install -# build -# I don't know why 'make install' ignores the binary when built in OBS -install -d $RPM_BUILD_ROOT/usr/bin -install -m 755 -p imagewriter $RPM_BUILD_ROOT/%{_bindir} -make install +make INSTALL_ROOT=%{buildroot} install %if 0%{?suse_version} %suse_update_desktop_file imagewriter %endif -%clean -rm -rf $RPM_BUILD_ROOT +%if 0%{?suse_version} >= 1140 +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif %files %defattr(-,root,root) +%doc COPYING %{_bindir}/imagewriter -%{_prefix}/share/applications/imagewriter.desktop -#%{_prefix}/share/icons/hicolor/*/apps/imagewriter.png -%dir %{_datadir}/icons/hicolor/*/apps/ -%dir %{_datadir}/icons/hicolor/*/ -%dir %{_datadir}/icons/hicolor/ +%{_datadir}/applications/imagewriter.desktop %{_datadir}/icons/hicolor/*/apps/imagewriter.* -%doc COPYING +%if 0%{?mandriva_version} +%{_mandir}/man1/imagewriter.1.* +%else +%{_mandir}/man1/imagewriter.1%{?ext_man} +%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
