[psimedia] revert move libgstprovider.so to %%{_libdir}/psimedia/

nucleo nucleo at fedoraproject.org
Mon Jan 28 15:01:04 UTC 2013


commit 341064964770d9f50f6661830176922720cef65e
Author: nucleo <nucleo at fedoraproject.org>
Date:   Mon Jan 28 17:00:56 2013 +0200

    revert move libgstprovider.so to %%{_libdir}/psimedia/

 psimedia-demo.patch |    4 ++--
 psimedia.spec       |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/psimedia-demo.patch b/psimedia-demo.patch
index c784de3..5cb88d1 100644
--- a/psimedia-demo.patch
+++ b/psimedia-demo.patch
@@ -58,12 +58,12 @@
 +	QString checkString() const { return QString(); }
 +	bool exec()
 +	{
-+		conf->addExtra(QString("PSI_PLUGINS_DIR=%1/psimedia").arg(conf->getenv("LIBDIR")));
++		conf->addExtra(QString("PSI_PLUGINS_DIR=%1/psi/plugins").arg(conf->getenv("LIBDIR")));
 +
 +		QFile file("demo/config.h");
 +		if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
 +			QTextStream stream( &file );
-+			stream << "#define PSI_PLUGINS_DIR \"" << conf->getenv("LIBDIR") << "/psimedia\"" << endl;
++			stream << "#define PSI_PLUGINS_DIR \"" << conf->getenv("LIBDIR") << "/psi/plugins\"" << endl;
 +		}
 +
 +		conf->addDefine("HAVE_CONFIG");
diff --git a/psimedia.spec b/psimedia.spec
index 034e58c..c3da214 100644
--- a/psimedia.spec
+++ b/psimedia.spec
@@ -51,7 +51,7 @@ is based on GStreamer.
 make %{?_smp_mflags}
 
 %install
-install -D -m 755 gstprovider/libgstprovider.so $RPM_BUILD_ROOT%{_libdir}/%{name}/libgstprovider.so
+install -D -m 755 gstprovider/libgstprovider.so $RPM_BUILD_ROOT%{_libdir}/psi/plugins/libgstprovider.so
 install -D -m 755 demo/demo $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 desktop-file-install                                    \
@@ -61,13 +61,16 @@ desktop-file-install                                    \
 
 %files
 %doc COPYING README TODO
+%dir %{_libdir}/psi
+%dir %{_libdir}/psi/plugins
 %{_bindir}/%{name}
-%{_libdir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_libdir}/psi/plugins/libgstprovider.so
 
 %changelog
 * Thu Jan 24 2013 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-11
-- move libgstprovider.so to %%{_libdir}/psimedia/
+- drop Requires: psi
+- own %%{_libdir}/psi and %%{_libdir}/psi/plugins
 - backport psi-plus-psimedia fixes
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-10


More information about the scm-commits mailing list