rpms/hplip/F-11 hplip-no-asm.patch, NONE, 1.1 hplip.spec, 1.217, 1.218 hplip.fdi, 1.4, NONE
Tim Waugh
twaugh at fedoraproject.org
Wed Aug 19 10:56:46 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13389
Modified Files:
hplip.spec
Added Files:
hplip-no-asm.patch
Removed Files:
hplip.fdi
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
- Make sure to avoid handwritten asm.
- Don't use obsolete configure options.
- Use upstream udev rules instead of hal policy (bug #518172).
hplip-no-asm.patch:
ipmain.c | 3 ---
xfax.c | 13 -------------
2 files changed, 16 deletions(-)
--- NEW FILE hplip-no-asm.patch ---
diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
--- hplip-3.9.8/ip/ipmain.c.no-asm 2009-08-19 11:35:39.770825475 +0100
+++ hplip-3.9.8/ip/ipmain.c 2009-08-19 11:36:25.767828346 +0100
@@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
void fatalBreakPoint (void)
{
/* do nothing */
-#if defined _DEBUG
- __asm int 3;
-#endif
PRINT0 (_T("\nhit fatalBreakPoint!\n"));
}
diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
--- hplip-3.9.8/ip/xfax.c.no-asm 2009-08-19 11:35:45.484827783 +0100
+++ hplip-3.9.8/ip/xfax.c 2009-08-19 11:36:39.815701961 +0100
@@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
& ((1u<<n_bits) - 1u); \
}
-#if 0
-
-#define BITS_LOAD(g, num_bits, par_result) { \
- int n_bits = (int)(num_bits); \
- \
- par_result = g->gb_cache; \
- \
- asm ("extract %1,%2,%0" \
- : "=d" (par_result) \
- : "dI" (g->gb_cache_cnt - n_bits), "dI" (n_bits), "0" (par_result)); \
-}
-
-#endif
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- hplip.spec 18 Aug 2009 09:03:21 -0000 1.217
+++ hplip.spec 19 Aug 2009 10:56:45 -0000 1.218
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.9.8
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -13,10 +13,10 @@ Conflicts: selinux-policy < 3.0.3-3
Url: http://hplip.sourceforge.net/
Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Source1: hplip.fdi
Patch1: hplip-hpcups-reorder.patch
Patch2: hplip-strstr-const.patch
Patch3: hplip-ui-optional.patch
+Patch4: hplip-no-asm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): /sbin/service
@@ -106,12 +106,15 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
%patch3 -p1 -b .ui-optional
+# Make sure to avoid handwritten asm.
+%patch4 -p1 -b .no-asm
+
%build
-%configure --disable-foomatic-xml-install --disable-cups-install \
+%configure \
--enable-scan-build --enable-gui-build --enable-fax-build \
- --disable-foomatic-rip-hplip-install --enable-dbus \
+ --disable-foomatic-rip-hplip-install \
--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
- --enable-hpijs-install
+ --enable-hpijs-install --enable-udev-acl-rules
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
@@ -126,7 +129,7 @@ make install DESTDIR=%{buildroot}
# Remove unpackaged files
rm -rf %{buildroot}%{_sysconfdir}/sane.d \
%{buildroot}%{_docdir} \
- %{buildroot}%{_sysconfdir}/udev/rules.d/*
+ %{buildroot}%{_datadir}/hal/fdi
rm -f %{buildroot}%{_bindir}/foomatic-rip \
%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -148,9 +151,6 @@ desktop-file-install --vendor HP \
--add-category Application \
hplip.desktop
-mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-
# Images in docdir should not be executable (bug #440552).
find doc/images -type f -exec chmod 644 {} \;
@@ -164,16 +164,13 @@ rm -f %{buildroot}%{_datadir}/hplip/hpij
# 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}
%files
%defattr(-,root,root)
%doc COPYING doc/*
-%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%{_sysconfdir}/udev/rules.d/*
%dir %{_sysconfdir}/hp
%config(noreplace) %{_sysconfdir}/hp/hplip.conf
%{_bindir}/hp-align
@@ -313,7 +310,12 @@ fi
exit 0
%changelog
-* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
+- Make sure to avoid handwritten asm.
+- Don't use obsolete configure options.
+
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+- Use upstream udev rules instead of hal policy (bug #518172).
- Removed unnecessary dependency on PyQt as we only use PyQt4 now.
* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
--- hplip.fdi DELETED ---
More information about the fedora-extras-commits
mailing list