packages: qdigidoc/qdigidoc.spec, qdigidoc/qdigidoc-nautilus-extensions-dir...

[megabajt]

Author: megabajt                     Date: Fri May 20 19:03:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed destination directory of nautilus extension
- release 5

---- Files affected:
packages/qdigidoc:
   qdigidoc.spec (1.5 -> 1.6) , qdigidoc-nautilus-extensions-dir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qdigidoc/qdigidoc.spec
diff -u packages/qdigidoc/qdigidoc.spec:1.5 packages/qdigidoc/qdigidoc.spec:1.6
--- packages/qdigidoc/qdigidoc.spec:1.5	Fri Feb  4 19:24:00 2011
+++ packages/qdigidoc/qdigidoc.spec	Fri May 20 21:03:44 2011
@@ -3,13 +3,14 @@
 Summary:	Estonian digital signature application
 Name:		qdigidoc
 Version:	0.4.0
-Release:	4
+Release:	5
 License:	LGPL v2+
 Group:		X11/Applications
 URL:		http://code.google.com/p/esteid/
 Source0:	http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	bf6fc905f5c806c1309d5e2861fe840e
 Patch0:		desktop.patch
+Patch1:		%{name}-nautilus-extensions-dir.patch
 BuildRequires:	QtWebKit-devel >= %{qtver}
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
@@ -22,8 +23,8 @@
 BuildRequires:	qt4-linguist >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.596
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
 Requires:	desktop-file-utils
+Requires:	hicolor-icon-theme
 Requires:	shared-mime-info
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,7 +38,8 @@
 Summary:	Nautilus extension for %{name}
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
-Requires:	nautilus-python
+Requires:	nautilus-python >= 1.0
+Requires:	python-pygobject
 
 %description -n nautilus-%{name}
 This package contains the qdigidoc extension for the nautilus file
@@ -54,6 +56,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -94,7 +97,7 @@
 
 %files -n nautilus-%{name} -f nautilus-qdigidoc.lang
 %defattr(644,root,root,755)
-%{_libdir}/nautilus/extensions-2.0/python/*
+%{_datadir}/nautilus-python/extensions/*.py
 
 %files -n kde4-konqueror-plugin-%{name}
 %defattr(644,root,root,755)
@@ -106,6 +109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/05/20 19:03:44  megabajt
+- fixed destination directory of nautilus extension
+- release 5
+
 Revision 1.5  2011/02/04 18:24:00  wiget
 - Requires(post,postun): gtk-update-icon-cache
 

================================================================
Index: packages/qdigidoc/qdigidoc-nautilus-extensions-dir.patch
diff -u /dev/null packages/qdigidoc/qdigidoc-nautilus-extensions-dir.patch:1.1
--- /dev/null	Fri May 20 21:03:49 2011
+++ packages/qdigidoc/qdigidoc-nautilus-extensions-dir.patch	Fri May 20 21:03:44 2011
@@ -0,0 +1,8 @@
+--- qdigidoc-0.4.0/client/nautilus/CMakeLists.txt.orig	2011-05-20 20:43:28.408950058 +0200
++++ qdigidoc-0.4.0/client/nautilus/CMakeLists.txt	2011-05-20 20:44:34.031927880 +0200
+@@ -6,4 +6,4 @@ find_package(Gettext)
+ file(GLOB PO_FILES po/*.po)
+ gettext_create_translations(po/nautilus-qdigidoc.pot ALL ${PO_FILES})
+ 
+-install(FILES nautilus-qdigidoc.py DESTINATION ${LIB_INSTALL_DIR}/nautilus/extensions-2.0/python/)
++install(FILES nautilus-qdigidoc.py DESTINATION ${SHARE_INSTALL_PREFIX}/nautilus-python/extensions/)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qdigidoc/qdigidoc.spec?r1=1.5&r2=1.6&f=u