- up to 1.6.9

- rel 1
- added missing BR

Changed files:
    hplip-DJ670C.xml -> 1.1
    hplip.spec -> 1.18

diff --git a/hplip-DJ670C.xml b/hplip-DJ670C.xml
new file mode 100644 (file)
index 0000000..a7d02e6
--- /dev/null
+++ b/hplip-DJ670C.xml
@@ -0,0 +1,28 @@
+<model name="DESKJET_670C">\r
+    <id></id>\r
+    <icon>DESKJET_630C.png</icon>\r
+    <support type="2"/>\r
+    <case-model>\r
+        <model1>Deskjet 670c</model1>\r
+        <model2>Deskjet 670k</model2>\r
+    </case-model>\r
+    <io support="1" mode="0" control="0" mfp-mode="2" scan-port="0"/>\r
+    <align type="0"/>\r
+    <clean type="0"/>\r
+    <color-cal type="0"/>\r
+    <status type="0"/>\r
+    <scan type="0"/>\r
+    <fax type="0"/>\r
+    <pcard type="0"/>\r
+    <copy type="0"/>\r
+    <tech class="DJ6xx" type="2"/>\r
+    <embedded-server type="0"/>\r
+    <panel-check type="0"/>\r
+    <linefeed-cal type="0"/>\r
+    <pq-diag type="0"/>\r
+    <r0>\r
+        <agent1 kind="3" type="1" sku="20 (C6614DN)"/>\r
+        <agent2 kind="3" type="2" sku="49 (51649A)"/>\r
+    </r0>\r
+</model>\r
+\r

diff --git a/hplip.spec b/hplip.spec
index 74f49bd3114623ca173debc9eba0fc8e967238ee..4a014b043f124bd588df686a4d155abf5e921f3d 100644 (file)
--- a/hplip.spec
+++ b/hplip.spec
@@ -9,18 +9,19 @@
 Summary:       Hewlett-Packard Linux Imaging and Printing Project
 Summary(pl):   Serwer dla drukarek HP Inkjet
 Name:          hplip
-Version:       1.6.7
-Release:       3
+Version:       1.6.9
+Release:       1
 License:       BSD, GPL v2 and MIT
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/hplip/%{name}-%{version}.tar.gz
-# Source0-md5: b1e814c7f5ef2a5033e4c3e5162ac694
+# Source0-md5: 38d57f58b48b5b0729d1de507776e7d1
 Source1:       %{name}.init
-Patch0:                %{name}-DJ670C.patch
+Source2:       %{name}-DJ670C.xml
 URL:           http://hplip.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_cups:BuildRequires:    cups-devel}
+BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libusb-devel
 BuildRequires: net-snmp-devel
@@ -99,11 +100,10 @@ Ten pakiet umo
 
 %prep
 %setup -q
-%patch0 -p1
-
 sed -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
 
 %build
+install %{SOURCE2} data/xml
 install /usr/share/automake/config.* .
 install /usr/share/automake/config.* prnt
 CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti"