[monkeystudio/f15] New svn checkout for 1.9.0.1 release

Nicoleau Fabien eponyme at fedoraproject.org
Mon Oct 24 18:50:07 UTC 2011 

commit f9c754b5dce7c45ecde4471cd66e2ec0d6b4ddd0
Author: eponyme <eponyme at fedoraproject.org>
Date:   Mon Oct 24 20:54:22 2011 +0200

    New svn checkout for 1.9.0.1 release

 .gitignore        |    1 +
 monkeystudio.spec |   62 +++++++++++++++++++++++++++++++---------------------
 sources           |    2 +-
 3 files changed, 39 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8695ecc..8ddb634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 mks-svn3732.tar.gz
 /mks-svn3904.tar.gz
+/mks-svn4332.tar.gz
diff --git a/monkeystudio.spec b/monkeystudio.spec
index 72a1267..b5af15e 100644
--- a/monkeystudio.spec
+++ b/monkeystudio.spec
@@ -1,24 +1,23 @@
 # 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     20101106
-%global svn_revision svn3904
+%global alphatag     20111024
+%global svn_revision svn4332
 
 # Package source is take from upstream svn repository
 # Use this command to generate source tarball :
-# svn export -r 3732 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3732
-# tar cfz mks-svn3732.tar.gz mks-svn3732
+# svn export -r 4332 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn4332
+# tar cfz mks-svn4332.tar.gz mks-svn4332
 
 Name:           monkeystudio
-Version:        1.8.4.0
-Release:        4.%{alphatag}%{svn_revision}%{?dist}
+Version:        1.9.0.1
+Release:        1.%{alphatag}%{svn_revision}%{?dist}
 Summary:        Free cross-platform Qt 4 IDE
 
 Group:          Development/Tools
 License:        GPLv3
 URL:            http://www.%{name}.org/
 Source0:        mks-%{svn_revision}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Version is specified to avoid plugin problems (see #475110 C22)
 BuildRequires:  qt-devel >= 4.5.2-12
@@ -42,23 +41,22 @@ code editor too ( JavaScript, XML, ... ).
 %prep
 %setup -q -n mks-%{svn_revision}
 
-chmod 0644 datas/templates/Python/PyQt\ Gui/{\$Form\ File\ Name\$.ui,template.ini,\$Project\ Name\$.xpyqt}
-chmod 0644 datas/templates/Python/Qt\ Form/{\$Class\ Name\$.ui,template.ini}
-chmod 0644 datas/templates/Python/PyQt\ Console/{template.ini,\$Project\ Name\$.xpyqt}
-chmod 0644 datas/templates/Python/QObject\ Herited\ Class/template.ini
-chmod 0644 plugins/base/SearchAndReplace/src/SearchAndReplace.{cpp,h}
-chmod 0644 plugins/base/Tools/src/Tools.{cpp,h}
-chmod 0644 plugins/interpreter/Python/src/*.{cpp,h}
-chmod 0644 plugins/xup/PyQt/src/PyQt.{cpp,h}
-chmod 0755 datas/apis/tags2api.py
+# Fix files permissions
+find monkey/src -type f -exec chmod 0644 {} \;
+find datas/templates/ -type f -exec chmod 0644 {} \;
+find plugins/ -type f -exec chmod 0644 {} \;
+chmod 0755 datas/apis/Tools/tags2api.py
 
+# For the "hidden files" rpmlint warning
+sed -i -e 's/\.ui/ui/' -e 's/\.moc/moc/' -e 's/\.rcc/rcc/' config.pri
+sed -i -e 's/\.ui/ui/' -e 's/\.moc/moc/' -e 's/\.rcc/rcc/' plugins/plugins.pri
+
+# End of file encoding
+sed -i -e 's/\r//' dev-readme 'datas/templates/Python/Qt Form - Single Inheritance/$Class Name$.ui' 'datas/templates/C++/Qt Form - No Inheritance/$Class Name$.ui' 'datas/templates/Python/PyQt Gui/$Form File Name$.ui'
 
 # UpdateChecker is removed because yum will take care of updates
 sed -i -e 's/UpdateChecker//' plugins/base/base.pro
 
-sed -i -e 's/\r//' 'datas/templates/Python/Qt Form/template.ini' 'datas/templates/Python/Qt Form/$Class Name$.ui' readme.txt 'datas/templates/Python/PyQt Gui/$Form File Name$.ui' dev-readme 'datas/apis/tags2api.py'
-sed -i -e 's/\.ui/ui/' -e 's/\.moc/moc/' -e 's/\.rcc/rcc/' config.pri
-sed -i -e 's/\.moc/moc/' plugins/plugins.pri 
 
 
 %build
@@ -67,7 +65,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
@@ -76,12 +73,7 @@ desktop-file-install --vendor="" \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Doxyfile GPL-3 readme.txt dev-readme
 %{_bindir}/%{name}
 %{_libdir}/%{name}
@@ -91,35 +83,55 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 24 2011 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.9.0.1-1.20111024svn4332
+- New svn checkout (for 1.9.0.1 release that handles Qt 4.8)
+
+* Tue Oct 11 2011 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.9.0.0-1.20111011svn4303
+- New svn checkout (for 1.9.0.0 release)
+
+* Sat May 14 2011 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-5.20110514svn3908
+- Update svn checkout to build with qscintilla 2.5
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.4.0-4.20101106svn3904
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Sat Nov  6 2010 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-3.20101106svn3904
 - Update svn checkout
+
 * Sun Jun 20 2010 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-2.20100517svn3732
 - Change qt-webkit-devel require to qt4-webkit-devel
+
 * Mon May 17 2010 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-1.20100517svn3732
 - New checkout for 1.8.4.0 post release and Qt 4.7 support
+
 * Mon Dec 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.4.20091214svn3482
 - Update svn checkout
 - Fix #539003
 - Add smp_mflags at build step, as it now works with this package
+
 * Mon Sep 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.3.20090824svn3243
 - Removed unused licence files
+
 * Mon Aug 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.2.20090824svn3243
 - Add qt-devel version to avoid plugin problems
 - Removed UpdateChecker plugin compilation
+
 * Mon Aug 24 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.1.20090824svn3243
 - Now using svn
+
 * Sat Jun 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.3-2
 - Remove 64 bits trick
 - Use qt4 macros
 - Fix some files permissions
+
 * Sun May 10 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.3-1
 - Rebuild for 1.8.3.3
+
 * Sun Feb 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.2-1
 - Rebuild for 1.8.3.2
+
 * Mon Dec 29 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.0-1
 - Rebuild for 1.8.3.0 release
+
 * Sun Dec  7 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.0-1.2625svn
 - initital build
diff --git a/sources b/sources
index ef8190e..3b5cb4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9c4d69fa400e3556e2189e4be7b7104  mks-svn3904.tar.gz
+52aca109cf2429d7e919800ad0a24364  mks-svn4332.tar.gz

More information about the scm-commits mailing list