rpms/postr/F-11 nautilus-ext-dir.patch, NONE, 1.1 postr.spec, 1.17, 1.18
Tim Lauridsen
timlau at fedoraproject.org
Wed Aug 26 12:27:19 UTC 2009
- Previous message: rpms/tog-pegasus/devel pegasus-2.9.0-openssl.patch, NONE, 1.1 tog-pegasus.spec, 1.75, 1.76
- Next message: rpms/kvirc/F-10 .cvsignore, 1.2, 1.3 kvirc.spec, 1.1, 1.2 sources, 1.2, 1.3 kvirc-flags.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: timlau
Update of /cvs/pkgs/rpms/postr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27212
Modified Files:
postr.spec
Added Files:
nautilus-ext-dir.patch
Log Message:
fix build on multi archs
nautilus-ext-dir.patch:
setup.py | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
--- NEW FILE nautilus-ext-dir.patch ---
--- postr-0.12.3/setup.py 2008-12-19 15:51:01.000000000 +0100
+++ postr-0.12.3.new/setup.py 2009-08-25 15:44:58.123732748 +0200
@@ -1,9 +1,30 @@
#!/usr/bin/env python
+import os
from distutils.core import setup
+from distutils.command.install_data import install_data
from glob import glob
from src.version import __version__
+
+class InstallData(install_data):
+ def run(self):
+ self.data_files.extend(self._nautilus_plugin())
+ install_data.run(self)
+
+ def _nautilus_plugin(self):
+ files = []
+ cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
+ res = cmd.readline().strip()
+ ret = cmd.close()
+
+ if ret is None:
+ dest = res[5:]
+ files.append((dest, ['nautilus/postrExtension.py']))
+
+ return files
+
+
setup(name='Postr',
version=__version__,
description='Flickr Uploader',
@@ -21,10 +42,7 @@
('share/icons/hicolor/24x24/apps', glob('data/24x24/*.png')),
('share/icons/hicolor/32x32/apps', glob('data/32x32/*.png')),
('share/icons/hicolor/scalable/apps', glob('data/scalable/*.svg')),
- # TODO: inspect nautilus-python.pc to get path
- ('lib/nautilus/extensions-1.0/python', ['nautilus/postrExtension.py']),
- ('lib/nautilus/extensions-2.0/python', ['nautilus/postrExtension.py']),
- ],
+ ], cmdclass={'install_data': InstallData}
)
Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-11/postr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- postr.spec 25 Aug 2009 10:36:44 -0000 1.17
+++ postr.spec 26 Aug 2009 12:27:18 -0000 1.18
@@ -2,7 +2,7 @@
Name: postr
Version: 0.12.3
-Release: 5%{?dist}
+Release: 7%{?dist}
Summary: Flickr uploader
Group: Applications/Multimedia
@@ -10,11 +10,12 @@ License: GPLv2+
URL: http://www.burtonini.com/blog/computers/postr
Source0: http://burtonini.com/computing/%{name}-%{version}.tar.gz
Patch0: fix_upload_button.patch
+Patch1: nautilus-ext-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
BuildRequires: python-devel
BuildRequires: desktop-file-utils
+BuildRequires: nautilus-python-devel
Requires: python-twisted-core
Requires: python-twisted-web
Requires: pygtk2
@@ -31,6 +32,7 @@ Tool for uploading photos to the photo-s
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
@@ -65,7 +67,6 @@ touch --no-create %{_datadir}/icons/hico
%doc AUTHORS COPYING README TODO
%{_bindir}/%{name}
%{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
-%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
%{python_sitelib}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -73,6 +74,15 @@ touch --no-create %{_datadir}/icons/hico
%changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
+- Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
+- in the right directory
+- Added BuildRequires: nautilus-python-devel because we need the .pc file to
+- detect the right nautilus python extention dir
+
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-6
+- removed BuildArch: noarch to get it to build for each arch
+
* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
- use %%%{_libdir} in %%files to put the nautilus extension in the right place
- Previous message: rpms/tog-pegasus/devel pegasus-2.9.0-openssl.patch, NONE, 1.1 tog-pegasus.spec, 1.75, 1.76
- Next message: rpms/kvirc/F-10 .cvsignore, 1.2, 1.3 kvirc.spec, 1.1, 1.2 sources, 1.2, 1.3 kvirc-flags.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list