Merge pull request #2795 from MrAnno/python-debian-packaging

Follow-up Python pylib path change in deb and rpm packaging

packaging/debian/rules

@@ -114,13 +114,10 @@ override_dh_auto_configure:
 # we override libdir above to place everything useful there. We want
 # the .pc file elsewhere, though, so do that here at install time.
 #
-# Similarly, we want to install python modules to their proper place,
-# and this is a great time to tell the build system where that is.
 # Also removing .la files, these files don't needed and just confuse
 # the list-missing option
 override_dh_auto_install:
-	dh_auto_install -- pkgconfigdir=/usr/lib/pkgconfig \
-			   PYSETUP_OPTIONS="--install-layout=deb --root=$(CURDIR)/debian/tmp/"
+	dh_auto_install -- pkgconfigdir=/usr/lib/pkgconfig
 	find . -name \*.la | xargs --no-run-if-empty rm
 
 override_dh_auto_test: ;

packaging/debian/syslog-ng-mod-python.install

@@ -1,2 +1,2 @@
 usr/lib/syslog-ng/*/libmod-python.so
-usr/lib/python*
+usr/lib/syslog-ng/*/python/*

packaging/rhel/syslog-ng.spec

@@ -296,7 +296,7 @@ export GEOIP_LIBS=-lGeoIP
     --sysconfdir=%{_sysconfdir}/%{name} \
     --localstatedir=%{_sharedstatedir}/%{name} \
     --datadir=%{_datadir} \
-    --with-module-dir=/%{_libdir}/%{name} \
+    --with-module-dir=%{_libdir}/%{name} \
     --with-systemdsystemunitdir=%{_unitdir} \
     --with-ivykis=system \
 %if 0%{?rhel}
@@ -550,8 +550,8 @@ fi
 %{_libdir}/%{name}/libhttp.so
 
 %files python
-/usr/lib/python%{py_ver}/site-packages/syslogng-1.0-py%{py_ver}.egg-info
-/usr/lib/python%{py_ver}/site-packages/syslogng/*
+%{_libdir}/%{name}/python/syslogng-1.0-py%{py_ver}.egg-info
+%{_libdir}/%{name}/python/syslogng/*
 %{_libdir}/%{name}/libmod-python.so
 
 %files devel