[monkeystudio] Update to 1.9.0.4
Nicoleau Fabien
eponyme at fedoraproject.org
Sun Feb 10 14:45:42 UTC 2013
commit b4489ec26eecece743520161d12e99387c733cd7
Author: eponyme <eponyme at fedoraproject.org>
Date: Sun Feb 10 15:45:36 2013 +0100
Update to 1.9.0.4
.gitignore | 1 +
monkeystudio.spec | 31 ++++++++++++++-----------------
sources | 2 +-
3 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b25a27b..1c0641b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ mks-svn3732.tar.gz
/mks-svn4332.tar.gz
/mks-svn4347.tar.gz
/mks-svn4458.tar.gz
+/mks-svn4524.tar.gz
diff --git a/monkeystudio.spec b/monkeystudio.spec
index 4372ea6..c0edd9d 100644
--- a/monkeystudio.spec
+++ b/monkeystudio.spec
@@ -1,18 +1,18 @@
# Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%global alphatag 20120501
-%global svn_revision svn4458
+%global alphatag 20130118
+%global svn_revision svn4524
# Package source is take from upstream svn repository
# Use this command to generate source tarball :
-# svn export -r 4458 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn4458
-# svn export -r 4458 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/tools mks-svn4458/tools
-# tar cfz mks-svn4458.tar.gz mks-svn4458
+# svn export -r 4524 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn4524
+# svn export -r 4524 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/tools mks-svn4524/tools
+# tar cfz mks-svn4524.tar.gz mks-svn4524
Name: monkeystudio
-Version: 1.9.0.2
-Release: 3.%{alphatag}%{svn_revision}%{?dist}
+Version: 1.9.0.4
+Release: 1.%{alphatag}%{svn_revision}%{?dist}
Summary: Free cross-platform Qt 4 IDE
Group: Development/Tools
@@ -20,9 +20,10 @@ License: GPLv3
URL: http://www.%{name}.org/
Source0: mks-%{svn_revision}.tar.gz
+# Version is specified to avoid plugin problems (see #475110 C22)
+BuildRequires: qt-devel >= 4.5.2-12
+BuildRequires: qt4-webkit-devel
BuildRequires: desktop-file-utils
-BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtHelp) pkgconfig(QtNetwork) pkgconfig(QtScript) pkgconfig(QtXml)
-BuildRequires: pkgconfig(QtWebKit)
BuildRequires: qscintilla-devel
%description
@@ -61,12 +62,12 @@ sed -i -e 's/UpdateChecker//' plugins/base/base.pro
sed -i -e 's/INSTALL.*monkey_docs$/INSTALLS = monkey_datas/' installs.pri
%build
-%{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
+%{_qt4_qmake} -r prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
make %{?_smp_mflags}
%install
-%{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1 INSTALLS-=monkey_docs
+%{_qt4_qmake} -r prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1 INSTALLS-=monkey_docs
make install INSTALL_ROOT=$RPM_BUILD_ROOT
desktop-file-install --vendor="" \
--mode 644 \
@@ -84,12 +85,8 @@ desktop-file-install --vendor="" \
%changelog
-* Mon Dec 17 2012 Rex Dieter <rdieter at fedoraproject.org> - 1.9.0.2-3.20120501svn4458
-- rebuild (qscintilla)
-- use pkgconfig-style Qt deps
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0.2-2.20120501svn4458
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Fri Jan 18 2013 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.9.0.4-1.20130118svn4524
+- New svn checkout for 1.9.0.4
* Tue May 1 2012 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.9.0.2-1.20120501svn4458
- New svn checkout for 1.9.0.2
diff --git a/sources b/sources
index 373b58b..1e432fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65dfab4fa755b7cd21c777553d5ab9db mks-svn4458.tar.gz
+46c361039c062f24d6034357f2c6f663 mks-svn4524.tar.gz
More information about the scm-commits
mailing list