rpms/klear/devel klear-namespaces.patch, NONE, 1.1 klear-scons-chmod.patch, NONE, 1.1 klear.spec, 1.3, 1.4
Johan Cwiklinski
trasher at fedoraproject.org
Sat Aug 30 15:06:08 UTC 2008
- Previous message (by thread): rpms/klear/F-9 klear-scons-chmod.patch,NONE,1.1 klear.spec,1.3,1.4
- Next message (by thread): rpms/libxml2/devel .cvsignore, 1.40, 1.41 libxml2.spec, 1.56, 1.57 sources, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: trasher
Update of /cvs/extras/rpms/klear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14237
Modified Files:
klear.spec
Added Files:
klear-namespaces.patch klear-scons-chmod.patch
Log Message:
Fix scons build error and namespace pollution (bz #440755)
klear-namespaces.patch:
--- NEW FILE klear-namespaces.patch ---
diff -up klear/src/GUI/Controller/CKlearControllerMain.h.patch klear/src/GUI/Controller/CKlearControllerMain.h
--- klear/src/GUI/Controller/CKlearControllerMain.h.patch 2008-08-30 16:42:22.000000000 +0200
+++ klear/src/GUI/Controller/CKlearControllerMain.h 2008-08-30 16:42:44.000000000 +0200
@@ -33,7 +33,9 @@
#include <qdir.h>
#include <X11/keysym.h>
+#define INT32 X11_INT32
#include <X11/extensions/XTest.h>
+#undef INT32
#include "../../config.h"
klear-scons-chmod.patch:
--- NEW FILE klear-scons-chmod.patch ---
diff -up klear/bksys/generic.py.patch klear/bksys/generic.py
--- klear/bksys/generic.py.patch 2008-08-30 16:03:47.000000000 +0200
+++ klear/bksys/generic.py 2008-08-30 16:05:05.000000000 +0200
@@ -244,7 +244,8 @@ class genobj:
ret=self.env.Program(self.p_localtarget, self.p_localsource)
if not self.env.has_key('NOAUTOINSTALL'):
ins=self.env.bksys_install(self.instdir, ret)
- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
+ if ins and self.perms:
+ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
elif self.type=='staticlib':
ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
@@ -462,7 +463,8 @@ def generate(env):
if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
+ if perms and install_list:
+ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms))
env.Alias('install', install_list)
return install_list
Index: klear.spec
===================================================================
RCS file: /cvs/extras/rpms/klear/devel/klear.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- klear.spec 24 Feb 2008 22:15:22 -0000 1.3
+++ klear.spec 30 Aug 2008 15:05:38 -0000 1.4
@@ -2,7 +2,7 @@
Name: klear
Version: 0.7.0
-Release: 1.svn%{svnrel}%{?dist}
+Release: 2.svn%{svnrel}%{?dist}
Summary: DVB TV application and harddisk-recorder for linux
Group: Applications/Multimedia
@@ -11,6 +11,8 @@
# svn co http://www.tr0ll.net/svn/klear
# tar cvjf /home/rpmbuild/SOURCES/klear-svn.tar.bz2 --exclude .svn klear
Source0: %{name}-svn.tar.bz2
+Patch0: klear-scons-chmod.patch
+Patch1: klear-namespaces.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons kdebase3-devel xine-lib-devel chrpath libXtst-devel gettext desktop-file-utils
@@ -24,6 +26,8 @@
%prep
%setup -q -n %{name}
+patch -p1 < %{PATCH0}
+patch -p1 < %{PATCH1}
pushd distfiles
iconv -f ISO-8859-1 -t UTF-8 AUTHORS > AUTHORS.utf && mv AUTHORS.utf AUTHORS
popd
@@ -87,6 +91,10 @@
%changelog
+* Sat Aug 30 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.7.0-2.svn113
+- add a patch fo scons Chmod error
+- fix headers conflict (bz #440755)
+
* Sun Feb 24 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.7.0-1.svn113
- Use SVN sources for compiling with GCC 4.3
- Previous message (by thread): rpms/klear/F-9 klear-scons-chmod.patch,NONE,1.1 klear.spec,1.3,1.4
- Next message (by thread): rpms/libxml2/devel .cvsignore, 1.40, 1.41 libxml2.spec, 1.56, 1.57 sources, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list