[kdepim] fix ftbfs
by Rex Dieter
commit 4a8c36e3771eb897896bd51726b964849ea17096
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 16:46:54 2011 -0500
fix ftbfs
kdepim.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/kdepim.spec b/kdepim.spec
index 1c7b617..f6e21be 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -91,7 +91,9 @@ mkdir -p %{_target_platform}
pushd %{_target_platform}
# We disable kdepim-mobile because it doesn't actually work yet. (#717694)
# Plus, it should probably go to a subpackage once it actually does work.
-%{cmake_kde4} -DKDEPIM_BUILD_MOBILE:BOOL=FALSE ..
+%{cmake_kde4} \
+ -DKDEPIM_BUILD_MOBILE:BOOL=OFF \
+ ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -184,6 +186,11 @@ rm -rf %{buildroot}
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*.desktop
+%{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf
+%{_kde4_libexecdir}/kalarm_helper
+%{_datadir}/dbus-1/system-services/org.kde.kalarmrtcwake.service
+%{_polkit_qt_policydir}/org.kde.kalarmrtcwake.policy
+%{_kde4_docdir}/HTML/en/*
%{_mandir}/man*/*.gz
%files libs
11Â years, 7Â months
[man-pages-ru] Man-pages-ru 3.32-2087-1553-20110626 fix build
by nucleo
commit 36944b4f4ef7e2f930fd1875db00228929e3486f
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Fri Jul 1 00:42:42 2011 +0300
Man-pages-ru 3.32-2087-1553-20110626
fix build
.gitignore | 1 +
man-pages-ru.spec | 12 +++++++++---
sources | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7cabe53..477071f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
manpages-ru-0.97.rh.tar.bz2
man-pages-ru_3.25-2064-1352-20100717.tar.bz2
/man-pages-ru_3.32-2087-1512-20101219.tar.bz2
+/man-pages-ru_3.32-2087-1553-20110626.tar.bz2
diff --git a/man-pages-ru.spec b/man-pages-ru.spec
index 9a01c04..3a19041 100644
--- a/man-pages-ru.spec
+++ b/man-pages-ru.spec
@@ -1,8 +1,8 @@
-%global mpr_version 3.32-2087-1512-20101219
+%global mpr_version 3.32-2087-1553-20110626
Summary: Russian man pages from the Linux Documentation Project
Name: man-pages-ru
Version: 0.98
-Release: 4%{?dist}
+Release: 5%{?dist}
# Source1 has GFDL license
License: BSD and GPL+ and MIT and GFDL
Group: Documentation
@@ -28,6 +28,9 @@ Russian.
%setup -q -n manpages-ru-0.97.rh -a 1
%patch0 -p1
+# aliases already installed
+sed -i "s|install-pages install-aliases|install-pages|g" Makefile
+
iconv -f koi8-r -t UTF-8 < NEWS > NEWS.new
mv -f NEWS.new NEWS
@@ -39,7 +42,6 @@ done
# remove bogus pages from Source1:
rm man-pages-ru_%{mpr_version}/man2/gethostid.2
rm man-pages-ru_%{mpr_version}/man2/sethostid.2
-rm man-pages-ru_%{mpr_version}/man2/setregid.2
rm man-pages-ru_%{mpr_version}/man5/ipc.5
rm man-pages-ru_%{mpr_version}/man4/fifo.4
rm man-pages-ru_%{mpr_version}/man5/complex.5
@@ -95,6 +97,10 @@ rm -fr $RPM_BUILD_ROOT
%{_mandir}/ru/man*/*
%changelog
+* Thu Jun 30 2011 Alexey Kurov <nucleo(a)fedoraproject.org> - 0.98-5
+- Man-pages-ru 3.32-2087-1553-20110626
+- fix build
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index ed9b53b..0b1d4a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
1dc21326f604b18db20acfffb334eee9 manpages-ru-0.97.rh.tar.bz2
-737a5cdad7b18131a401940c4c655cb2 man-pages-ru_3.32-2087-1512-20101219.tar.bz2
+e329f02ffbc3becd6a49fdf94e954aba man-pages-ru_3.32-2087-1553-20110626.tar.bz2
11Â years, 7Â months
[anki] Update to new upstream version 1.2.9 (BZ 717584) to fix more compatibility issues with python-sqlalc
by Christian Krause
commit a59a7d8bb73079e97a45b871a275899422a750ab
Author: Christian Krause <chkr(a)fedoraproject.org>
Date: Thu Jun 30 23:37:24 2011 +0200
Update to new upstream version 1.2.9 (BZ 717584) to fix more
compatibility issues with python-sqlalchemy-0.7.x
Remove upstreamed patches
Add patch to avoid unicode error messages on startup
.gitignore | 1 +
anki-1.2.8-sqlalchemy-0.7.patch | 30 ------------------------------
anki-1.2.9-unicode.patch | 12 ++++++++++++
anki.spec | 19 +++++++++++--------
sources | 2 +-
5 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 668107b..82dda3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ anki-1.0.1.tgz
/anki-1.2.6.tgz
/anki-1.2.7.tgz
/anki-1.2.8.tgz
+/anki-1.2.9.tgz
diff --git a/anki-1.2.9-unicode.patch b/anki-1.2.9-unicode.patch
new file mode 100644
index 0000000..adbb8e4
--- /dev/null
+++ b/anki-1.2.9-unicode.patch
@@ -0,0 +1,12 @@
+diff -uNr anki-1.2.9.old/libanki/anki/deck.py anki-1.2.9/libanki/anki/deck.py
+--- anki-1.2.9.old/libanki/anki/deck.py 2011-06-29 03:30:56.000000000 +0200
++++ anki-1.2.9/libanki/anki/deck.py 2011-06-30 23:30:49.800702013 +0200
+@@ -3594,7 +3594,7 @@
+ sourcesTable = Table(
+ 'sources', metadata,
+ Column('id', Integer, nullable=False, primary_key=True),
+- Column('name', UnicodeText, nullable=False, default=""),
++ Column('name', UnicodeText, nullable=False, default=u""),
+ Column('created', Float, nullable=False, default=time.time),
+ Column('lastSync', Float, nullable=False, default=0),
+ # -1 = never check, 0 = always check, 1+ = number of seconds passed.
diff --git a/anki.spec b/anki.spec
index a9257d4..ba5e58a 100644
--- a/anki.spec
+++ b/anki.spec
@@ -1,8 +1,8 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: anki
-Version: 1.2.8
-Release: 2%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning
Group: Amusements/Games
@@ -14,9 +14,8 @@ Source0: http://anki.googlecode.com/files/%{name}-%{version}.tgz
# Config change: don't check for new updates.
Patch0: anki-1.0-noupdate.patch
-# https://github.com/dae/libanki/commit/0e8df85619bb0588750b20446d4d8a02de5...
-# https://github.com/dae/libanki/commit/e318f7686c02d4de25804fbdaa85c07f442...
-Patch1: anki-1.2.8-sqlalchemy-0.7.patch
+# Avoid unicode error message on startup
+Patch1: anki-1.2.9-unicode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel, python-setuptools, python-sqlalchemy
BuildRequires: desktop-file-utils, PyQt4, python-simplejson
@@ -35,9 +34,7 @@ as possible. Anki is based on a theory called spaced repetition.
%prep
%setup -q
%patch0 -F 9 -p1 -b .noupdate
-pushd libanki
-%patch1 -p1 -b .sqlalchemy-0.7
-popd
+%patch1 -p1 -b .unicode
%{__sed} -i -e '/^#!\//, 1d' ankiqt/ui/dropbox.py
%build
@@ -109,6 +106,12 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Thu Jun 30 2011 Christian Krause <chkr(a)fedoraproject.org> - 1.2.9-1
+- Update to new upstream version 1.2.9 (BZ 717584) to fix more
+ compatibility issues with python-sqlalchemy-0.7.x
+- Remove upstreamed patches
+- Add patch to avoid unicode error messages on startup
+
* Tue Jun 28 2011 Christian Krause <chkr(a)fedoraproject.org> - 1.2.8-2
- Fix FTBFS issue (BZ 715813)
- Adding two upstream patches to support python-sqlalchemy-0.7.x
diff --git a/sources b/sources
index 119eaf7..104bea2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dc5f5bad979f57cab82e3757665f6c0 anki-1.2.8.tgz
+3b32c40c589565ebd5b349f8e0d36967 anki-1.2.9.tgz
11Â years, 7Â months