[frescobaldi/f12/master] * Thu Aug 19 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3-1 - New upstream ve

Orcan Ogetbil oget at fedoraproject.org
Thu Aug 19 05:02:58 UTC 2010


commit cff2d0bf4a88a10915a8facd2a1f40be471e0e37
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Aug 19 01:02:54 2010 -0400

    * Thu Aug 19 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3-1
    - New upstream version (for KDE 4.5)
    - Drop BR: gettext ImageMagick lilypond that are no longer required

 .gitignore             |    1 +
 frescobaldi-py27.patch |   14 ++++++++++++++
 frescobaldi.spec       |   19 +++++++++++++++----
 sources                |    2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba5f2d6..ed4c9f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 frescobaldi-1.0.2.tar.gz
+frescobaldi-1.0.3.tar.gz
diff --git a/frescobaldi-py27.patch b/frescobaldi-py27.patch
new file mode 100644
index 0000000..924a513
--- /dev/null
+++ b/frescobaldi-py27.patch
@@ -0,0 +1,14 @@
+diff -rupN frescobaldi-1.0.2.old/checkmodules.py frescobaldi-1.0.2/checkmodules.py
+--- frescobaldi-1.0.2.old/checkmodules.py	2009-12-13 02:36:46.000000000 -0500
++++ frescobaldi-1.0.2/checkmodules.py	2010-07-27 19:55:08.000000000 -0400
+@@ -31,8 +31,8 @@ errors = []
+ mkver = lambda major, minor, release: major * 65536 + minor * 256 + release
+     
+ # versions
+-if sys.version_info[:2] not in ((2,4), (2,5), (2,6)):
+-    errors.append("Python version %s.%s.%s found, but need 2.4, 2.5 or 2.6." %
++if sys.version_info[:2] not in ((2,4), (2,5), (2,6), (2,7)):
++    errors.append("Python version %s.%s.%s found, but need 2.4, 2.5, 2.6  or 2.7." %
+         sys.version_info[:3])
+         
+ if sip.SIP_VERSION < mkver(4, 7, 7):
diff --git a/frescobaldi.spec b/frescobaldi.spec
index 009e062..7d9db9c 100644
--- a/frescobaldi.spec
+++ b/frescobaldi.spec
@@ -1,5 +1,5 @@
 Name:           frescobaldi
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
@@ -9,13 +9,13 @@ Group:          Applications/Editors
 License:        GPLv2+ and LGPLv2+ and Public Domain
 URL:            http://www.frescobaldi.org/
 Source0:        http://lilykde.googlecode.com/files/%{name}-%{version}.tar.gz
+# Enable build for python-2.7
+# http://code.google.com/p/lilykde/issues/detail?id=34
+Patch0:         frescobaldi-py27.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
-BuildRequires:  gettext 
-BuildRequires:  ImageMagick
-BuildRequires:  lilypond
 BuildRequires:  PyKDE4
 
 Requires:       alsa-utils
@@ -54,6 +54,7 @@ yet lightweight and easy to use. It features:
 
 %prep
 %setup -q
+%patch0 -p1 -b .py27
 
 %build
 %{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
@@ -119,6 +120,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Thu Aug 19 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3-1
+- New upstream version (for KDE 4.5)
+- Drop BR: gettext ImageMagick lilypond that are no longer required
+
+* Tue Jul 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.2-3
+- Enable build for python-2.7
+
+* Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Sat Feb 20 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.2-1
 - New upstream version (for KDE 4.4)
 
diff --git a/sources b/sources
index 30da125..157783a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fde91a9e99bdff6f26f145d5688618a  frescobaldi-1.0.2.tar.gz
+c8e2c4e90bf3c8fd91526f0074d22492  frescobaldi-1.0.3.tar.gz


More information about the scm-commits mailing list