rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Make --qt4 the default for the systray applet, so that it appears in the

Browse Source 
right place, again (bug #479751).
- Removed hal preprobe rules as they were causing breakage (bug #479648).
This commit is contained in:
Tim Waugh 2009-01-13 13:19:57 +00:00
parent e53647a38f
commit 446491af41
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 2.8.12 Version: 2.8.12
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -126,7 +126,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%build %build
%configure --disable-foomatic-xml-install --disable-cups-install \ %configure --disable-foomatic-xml-install --disable-cups-install \
--enable-scan-build --enable-gui-build --enable-fax-build \ --enable-scan-build --enable-gui-build --enable-fax-build \
--disable-foomatic-rip-hplip-install --enable-dbus --disable-foomatic-rip-hplip-install --enable-dbus \
--enable-qt4
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -176,6 +177,9 @@ rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
# window), so don't ship the launcher yet. # window), so don't ship the launcher yet.
rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
# Remove the hal preprobe rules as they were causing breakage (bug #479648).
rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -183,7 +187,6 @@ rm -rf %{buildroot}
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING doc/* %doc COPYING doc/*
%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
%dir %{_sysconfdir}/hp %dir %{_sysconfdir}/hp
%config(noreplace) %{_sysconfdir}/hp/hplip.conf %config(noreplace) %{_sysconfdir}/hp/hplip.conf
%{_bindir}/hp-align %{_bindir}/hp-align
@ -277,6 +280,7 @@ rm -rf %{buildroot}
%{_datadir}/hplip/data/images %{_datadir}/hplip/data/images
%{_datadir}/hplip/plugins %{_datadir}/hplip/plugins
%{_datadir}/hplip/ui %{_datadir}/hplip/ui
%{_datadir}/hplip/ui4
%files -n hpijs %files -n hpijs
%defattr(-,root,root) %defattr(-,root,root)
@ -313,6 +317,12 @@ fi
exit 0 exit 0
%changelog %changelog
* Tue Jan 13 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-3
- Make --qt4 the default for the systray applet, so that it appears
in the right place, again (bug #479751).
- Removed hal preprobe rules as they were causing breakage
(bug #479648).
* Mon Jan 12 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-2 * Mon Jan 12 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-2
- Don't write to system-wide configuration file (bug #479178). - Don't write to system-wide configuration file (bug #479178).