pool/gpsd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544790 from home:RBrownSUSE:branches:Application:Geo

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544790
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=111
This commit is contained in:
Martin Pluskal 2017-11-23 15:03:00 +00:00 committed by Git OBS Bridge
parent efcd9ecff1
commit bf1a342689
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpsd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:50:05 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 20 13:48:01 UTC 2017 - mpluskal@suse.com Mon Nov 20 13:48:01 UTC 2017 - mpluskal@suse.com

11
gpsd.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define sover 23 %define sover 23
%define libgps libgps%{sover} %define libgps libgps%{sover}
%define libQgps libQgpsmm%{sover} %define libQgps libQgpsmm%{sover}
@ -161,12 +166,12 @@ export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install
install -d -m 755 %{buildroot}%{_udevdir} install -d -m 755 %{buildroot}%{_udevdir}
install -d -m 755 %{buildroot}%{_udevdir}/rules.d install -d -m 755 %{buildroot}%{_udevdir}/rules.d
install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -d -m 755 %{buildroot}%{_fillupdir}
install -d -m 755 %{buildroot}%{_datadir}/applications install -d -m 755 %{buildroot}%{_datadir}/applications
install -d -m 755 %{buildroot}%{python_sitearch} install -d -m 755 %{buildroot}%{python_sitearch}
install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules
install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh
install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 644 %{SOURCE3} %{buildroot}%{_fillupdir}
if [ %{buildroot}%{python_sitelib} != %{buildroot}%{python_sitearch} ] ; then if [ %{buildroot}%{python_sitelib} != %{buildroot}%{python_sitearch} ] ; then
mv -f %{buildroot}%{python_sitelib}/* %{buildroot}%{python_sitearch} mv -f %{buildroot}%{python_sitelib}/* %{buildroot}%{python_sitearch}
fi fi
@ -230,7 +235,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%{_sbindir}/gpsd %{_sbindir}/gpsd
%{_sbindir}/gpsdctl %{_sbindir}/gpsdctl
%{_bindir}/gpsctl %{_bindir}/gpsctl
%{_localstatedir}/adm/fillup-templates/sysconfig.gpsd %{_fillupdir}/sysconfig.gpsd
%files -n %{libgps} %files -n %{libgps}
%defattr(-,root,root) %defattr(-,root,root)