[packages/postr] - fix nautilus extension dir detection (patch from fedora) - rel 3

[baggins]

commit 49914d98711d72b1f192bfcac8778a87200e8756
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 3 15:29:41 2014 +0200

    - fix nautilus extension dir detection (patch from fedora)
    - rel 3

 nautilus-ext-dir.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 postr.spec             | 13 +++++--------
 2 files changed, 50 insertions(+), 8 deletions(-)
---
diff --git a/postr.spec b/postr.spec
index a682f47..67f7663 100644
--- a/postr.spec
+++ b/postr.spec
@@ -2,12 +2,14 @@ Summary:	A Flickr photo uploader
 Summary(pl.UTF-8):	Narzędzie do umieszczania zdjęć na Flickr
 Name:		postr
 Version:	0.12.5
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/postr/0.12/%{name}-%{version}.tar.xz
 # Source0-md5:	e0e50fc64ba749cd4999015dc30c1ad9
+Patch0:		nautilus-ext-dir.patch
 URL:		http://projects.gnome.org/postr/
+BuildRequires:	nautilus-python
 BuildRequires:	rpm-pythonprov
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -43,6 +45,7 @@ To rozszerzenie pozwala wysyłać pliki na serwis Flickr z Nautilusa.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,12 +54,6 @@ rm -rf $RPM_BUILD_ROOT
 	--root=$RPM_BUILD_ROOT \
 	--optimize=2
 
-if [ "%{_libdir}" != "/usr/lib" ]; then
-	%{__mv} $RPM_BUILD_ROOT{/usr/lib,%{_libdir}}
-fi
-
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,4 +76,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n nautilus-extension-postr
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/python/postrExtension.py
+%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/python/postrExtension.py
diff --git a/nautilus-ext-dir.patch b/nautilus-ext-dir.patch
new file mode 100644
index 0000000..08e59f0
--- /dev/null
+++ b/nautilus-ext-dir.patch
@@ -0,0 +1,45 @@
+--- 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}
+       
+       )
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/postr.git/commitdiff/8475e87b34e296ef39e1ccc5ee6363292d9ad097