rpms/ccsm/F-12 widgets_filter.patch,NONE,1.1 ccsm.spec,1.14,1.15
Leigh Scott
leigh123linux at fedoraproject.org
Sat May 1 21:49:39 UTC 2010
Author: leigh123linux
Update of /cvs/pkgs/rpms/ccsm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1642
Modified Files:
ccsm.spec
Added Files:
widgets_filter.patch
Log Message:
* Sat May 1 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-4
- update python marcos
- add widgets_filter patch (Bz 553665)
- fix ccsm directory ownership
widgets_filter.patch:
Widgets.py | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE widgets_filter.patch ---
--- ccsm-0.8.2.orig/ccm/Widgets.py 2009-10-14 02:05:30.000000000 +0100
+++ ccsm-0.8.2/ccm/Widgets.py 2010-05-01 22:20:52.000000000 +0100
@@ -1233,6 +1233,9 @@ class FileButton (gtk.Button):
filter = gtk.FileFilter ()
if self._image:
filter.set_name (_("Images"))
+ filter.add_mime_type ("image/png")
+ filter.add_mime_type ("image/jpeg")
+ filter.add_mime_type ("image/svg+xml")
filter.add_pattern ("*.png")
filter.add_pattern ("*.jpg")
filter.add_pattern ("*.jpeg")
Index: ccsm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccsm/F-12/ccsm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ccsm.spec 15 Feb 2010 22:56:26 -0000 1.14
+++ ccsm.spec 1 May 2010 21:49:39 -0000 1.15
@@ -1,10 +1,12 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
%define basever 0.8.2
Name: ccsm
Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugin and configuration tool - Compiz Fusion Project
Group: User Interface/Desktops
@@ -14,10 +16,8 @@ URL: http://www.opencompositi
Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch101: ccsm-removeshebangs.patch
-# upstream patches
-# http://gitweb.compiz.org/?p=compiz/compizconfig/ccsm;a=commitdiff;h=67b842dec00697bc461e26a83273846fdb28197e
-Patch102: ImportProfileAs.patch
-
+Patch102: ImportProfileAs.patch
+Patch103: widgets_filter.patch
# libdrm is not available on these arches
ExcludeArch: s390 s390x ppc64
@@ -39,6 +39,7 @@ plugins and the composite window manager
%setup -q
%patch101 -p1 -b .ccsm-removeshebangs
%patch102 -p1 -b .ImportProfileAs
+%patch103 -p1 -b .widgets_filter
%build
#configure
@@ -78,13 +79,20 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING VERSION
%{_bindir}/ccsm
%{_datadir}/applications/fedora-ccsm.desktop
-%{_datadir}/ccsm/
+%dir %{_datadir}/ccsm
+%{_datadir}/ccsm/*
%{_datadir}/icons/hicolor/*/apps/ccsm.*
-%{python_sitelib}/ccm/
+%dir %{python_sitelib}/ccm
+%{python_sitelib}/ccm/*
%{python_sitelib}/ccsm-%{version}-py?.?.egg-info
%changelog
+* Sat May 1 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-4
+- update python marcos
+- add widgets_filter patch (Bz 553665)
+- fix ccsm directory ownership
+
* Mon Feb 15 2010 leigh scott <leigh123linux at googlemail.com> - 0.8.2-3
- fix missing parameter in ImportProfileAs
More information about the scm-commits
mailing list