rpms/hplip/devel hplip.spec,1.193,1.194
Tim Waugh
twaugh at fedoraproject.org
Tue Jan 13 13:20:28 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21192
Modified Files:
hplip.spec
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at 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).
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- hplip.spec 12 Jan 2009 18:41:08 -0000 1.193
+++ hplip.spec 13 Jan 2009 13:19:57 -0000 1.194
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 2.8.12
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -126,7 +126,8 @@
%build
%configure --disable-foomatic-xml-install --disable-cups-install \
--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|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -176,6 +177,9 @@
# window), so don't ship the launcher yet.
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
rm -rf %{buildroot}
@@ -183,7 +187,6 @@
%defattr(-,root,root)
%doc COPYING doc/*
%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
%dir %{_sysconfdir}/hp
%config(noreplace) %{_sysconfdir}/hp/hplip.conf
%{_bindir}/hp-align
@@ -277,6 +280,7 @@
%{_datadir}/hplip/data/images
%{_datadir}/hplip/plugins
%{_datadir}/hplip/ui
+%{_datadir}/hplip/ui4
%files -n hpijs
%defattr(-,root,root)
@@ -313,6 +317,12 @@
exit 0
%changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at 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 at redhat.com> 2.8.12-2
- Don't write to system-wide configuration file (bug #479178).
More information about the fedora-extras-commits
mailing list