diff --git a/debian.changelog b/debian.changelog index 7e7a1be..1392af3 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,15 @@ +vym (2.5.4.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 22 Feb 2016 08:04:00 +0100 + +vym (2.5.3.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 22 Feb 2016 07:04:00 +0100 + vym (2.5.0.1) unstable; urgency=low * New upstream release diff --git a/vym-2.5.0.tar.bz2 b/vym-2.5.0.tar.bz2 deleted file mode 100644 index 04d4d22..0000000 --- a/vym-2.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55550549fcc8cc151ff6235a09bb8fc1412f0b598cc6f9072345058c5e12b9f3 -size 6740098 diff --git a/vym-2.5.4.tar.bz2 b/vym-2.5.4.tar.bz2 new file mode 100644 index 0000000..dc11137 --- /dev/null +++ b/vym-2.5.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d4d325842f487a16c5544859da96789792130c5c8c554e7d6abcaf94b8b3bb +size 6743390 diff --git a/vym.changes b/vym.changes index 905fbf8..b57a10a 100644 --- a/vym.changes +++ b/vym.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jun 21 06:57:11 UTC 2016 - vym@insilmaril.de + +- Update to upstream 2.5.4 +- Remove vym-2.5.0-gcc6.patch again, not required + +------------------------------------------------------------------- +Mon Jun 20 17:01:00 UTC 2016 - i@marguerite.su + +- add patch vym-2.5.0-gcc6.patch + * no known conversion for argument 2 from bool to QString, + actually the second QString was skipped, the bool value + was the 3rd argument. + ------------------------------------------------------------------- Wed Oct 28 08:53:55 UTC 2015 - vym@insilmaril.de diff --git a/vym.spec b/vym.spec index e3543ba..cb51f11 100644 --- a/vym.spec +++ b/vym.spec @@ -1,7 +1,7 @@ # # spec file for package vym # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,30 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: vym -BuildRequires: libQt5Core-devel -BuildRequires: libQt5Gui-devel -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-linguist-devel -BuildRequires: update-desktop-files -Requires: unzip -Requires: zip -Url: http://www.insilmaril.de/vym/index.html -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Name: vym +Version: 2.5.4 +Release: 0 Summary: View Your Mind - generate and manipulate maps which show your thoughts License: GPL-2.0 Group: Productivity/Office/Other -Version: 2.5.0 -Release: 0 -Source0: %name-%version.tar.bz2 -Source1: %name.xml -Source2: %name.desktop -Source3: x-%name.desktop +Url: http://www.insilmaril.de/vym/index.html +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}.xml +Source2: %{name}.desktop +Source3: x-%{name}.desktop Source4: debian.dirs Source5: debian.docs Source6: makedist.config +BuildRequires: libQt5Core-devel +BuildRequires: libQt5Gui-devel +BuildRequires: libqt5-linguist-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: update-desktop-files +Requires: unzip +Requires: zip +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description VYM (View Your Mind) is a tool to generate and manipulate maps which @@ -51,32 +51,29 @@ etc. Some people even think it is fun to work with such maps... %setup -q %build -qmake-qt5 -o Makefile vym.pro PREFIX=%_prefix/share BINDIR=%_prefix/bin CONFIG+=RELEASE -make lrelease-qt5 vym.pro +qmake-qt5 -o Makefile vym.pro PREFIX=%{_datadir} BINDIR=%{_bindir} CONFIG+=RELEASE +make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/vym -mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps -install -m 0644 icons/vym.png $RPM_BUILD_ROOT%{_prefix}/share/pixmaps -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -install -m 0644 README.md LICENSE.txt INSTALL.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -install -m 0644 doc/*.pdf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -%makeinstall INSTALL_ROOT=$RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_datadir}/vym +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -m 0644 icons/vym.png %{buildroot}%{_datadir}/pixmaps +mkdir -p %{buildroot}%{_defaultdocdir}/%{name} +install -m 0644 README.md LICENSE.txt INSTALL.txt %{buildroot}%{_defaultdocdir}/%{name} +install -m 0644 doc/*.pdf %{buildroot}%{_defaultdocdir}/%{name} +make %{?_smp_mflags} DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot} -mkdir -p $RPM_BUILD_ROOT/usr/share/applications -install -Dm644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications +mkdir -p %{buildroot}%{_datadir}/applications +install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/applications -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 doc/vym.1.gz $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 0644 doc/vym.1.gz %{buildroot}%{_mandir}/man1 -mkdir -p $RPM_BUILD_ROOT/usr/share/mime/packages -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/mime/packages/ +mkdir -p %{buildroot}%{_datadir}/mime/packages +install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/mime/packages/ %suse_update_desktop_file -i vym Office ProjectManagement -%clean -rm -rf $RPM_BUILD_ROOT - %post if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null @@ -84,13 +81,13 @@ fi %files %defattr(-,root,root) -/usr/share/applications/* -/usr/share/pixmaps/* -/usr/bin/vym -/usr/share/vym +%{_datadir}/applications/* +%{_datadir}/pixmaps/* +%{_bindir}/vym +%{_datadir}/vym %doc %{_docdir}/%{name} -%doc %{_mandir}/*/* +%{_mandir}/*/* %{_datadir}/mime/packages/vym.xml %changelog