Author: tsailer
Date: Sun Sep 18 22:36:24 2016
New Revision: 248
URL: http://svn.gna.org/viewcvs/vfrnav?rev=248&view=rev
Log:
build fixes
Modified:
trunk/cfmu/systemd/Makefile.in
trunk/configure
trunk/configure.ac
trunk/vfrnav.spec.in
Modified: trunk/cfmu/systemd/Makefile.in
URL:
http://svn.gna.org/viewcvs/vfrnav/trunk/cfmu/systemd/Makefile.in?rev=248&r1=247&r2=248&view=diff
==============================================================================
--- trunk/cfmu/systemd/Makefile.in (original)
+++ trunk/cfmu/systemd/Makefile.in Sun Sep 18 22:36:24 2016
@@ -432,7 +432,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-systemd_DATA = cfmuws.service cfmuautoroute.service cfmuautoroute.socket
cfmuvalidate.service cfmuvalidate.socket
+systemd_DATA = cfmuws.service cfmuautoroute@.service cfmuautoroute@.socket
cfmuvalidate.service cfmuvalidate.socket
sysconfig_DATA = cfmuws cfmuautoroute cfmuvalidate
sysconfvfrnav_DATA = cfmuwsusers.json
EXTRA_DIST = $(systemd_DATA) $(sysconfig_DATA) $(sysconfvfrnav_DATA)
Modified: trunk/configure
URL:
http://svn.gna.org/viewcvs/vfrnav/trunk/configure?rev=248&r1=247&r2=248&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Sep 18 22:36:24 2016
@@ -26522,7 +26522,7 @@
fi
- if test x$have_webkitgtk = xyes; then
+ if test x$have_webkitgtkwebext = xyes; then
HAVE_WEBKITGTKWEBEXT_TRUE=
HAVE_WEBKITGTKWEBEXT_FALSE='#'
else
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/vfrnav/trunk/configure.ac?rev=248&r1=247&r2=248&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Sep 18 22:36:24 2016
@@ -760,7 +760,7 @@
AC_DEFINE(HAVE_WEBKITGTKWEBEXT,[],[webkitgtk web extension library])
fi
-AM_CONDITIONAL(HAVE_WEBKITGTKWEBEXT, test x$have_webkitgtk = xyes)
+AM_CONDITIONAL(HAVE_WEBKITGTKWEBEXT, test x$have_webkitgtkwebext = xyes)
if test "x${with_mtmaps}" = "xyes" ; then
AC_DEFINE(HAVE_MULTITHREADED_MAPS,[1],[Define if maps should be
multithreaded])
Modified: trunk/vfrnav.spec.in
URL:
http://svn.gna.org/viewcvs/vfrnav/trunk/vfrnav.spec.in?rev=248&r1=247&r2=248&view=diff
==============================================================================
--- trunk/vfrnav.spec.in (original)
+++ trunk/vfrnav.spec.in Sun Sep 18 22:36:24 2016
@@ -259,8 +259,8 @@
rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.a
-rm -f $RPM_BUILD_ROOT/%{_libexec}/vfrnav/web-extensions/libcfmuwebextension.a
-rm -f $RPM_BUILD_ROOT/%{_libexec}/vfrnav/web-extensions/libcfmuwebextension.la
+rm -f
$RPM_BUILD_ROOT/%{_libexecdir}/%{name}/web-extensions/libcfmuwebextension.a
+rm -f
$RPM_BUILD_ROOT/%{_libexecdir}/%{name}/web-extensions/libcfmuwebextension.la
install -d $RPM_BUILD_ROOT/run/vfrnav/validator
install -d $RPM_BUILD_ROOT/var/lib/vfrnav
@@ -352,6 +352,7 @@
%{_bindir}/checkfplan
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/cfmuvalidateserver
+%{_libexecdir}/%{name}/web-extensions/libcfmuwebextension.so
%{_datadir}/%{name}/themes/gtk-3.0/flightdeck.css
%{_datadir}/%{name}/flightdeck.ui
%{_datadir}/%{name}/flightdeck/hbdhg.cfg
@@ -427,14 +428,6 @@
%files selinux
%{_datadir}/selinux/packages/%{name}/vfrnav.pp
-%files osmupdate
-%defattr(-,root,root,-)
-%dir %attr(0750,postgres,postgres) %{_localstatedir}/lib/osmupdate
-%config(noreplace) %attr(0644,postgres,postgres)
%{_localstatedir}/lib/osmupdate/seqnr.txt
-%{_sbindir}/osmincrupd.pl
-/lib/systemd/system/osmupdate.service
-/lib/systemd/system/osmupdate.timer
-
%if %{with webservice}
%files webservice
%defattr(-,root,root,-)
_______________________________________________
Vfrnav-commits mailing list
Vfrnav-commits@gna.org
https://mail.gna.org/listinfo/vfrnav-commits
