Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from Jun 25, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74341b4
packaging: change pylib path in syslog-ng-mod-python.install
MrAnno Jun 21, 2019
5539faf
packaging: do not override PYSETUP_OPTIONS in debian/rules
MrAnno Jun 21, 2019
e6334a4
packaging: fix double-slashed path in syslog-ng.spec (RPM)
MrAnno Jun 21, 2019
e0975d0
packaging: change pylib path in syslog-ng.spec (RPM)
MrAnno Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions packaging/debian/rules
View file
Open in desktop
Expand Up @@ -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: ;
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/syslog-ng-mod-python.install
View file
Open in desktop
@@ -1,2 +1,2 @@
usr/lib/syslog-ng/*/libmod-python.so
usr/lib/python*
usr/lib/syslog-ng/*/python/*
6 changes: 3 additions & 3 deletions packaging/rhel/syslog-ng.spec
View file
Open in desktop
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down