[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2ae4bcdf5e4c3b156f2a6d947ad6fc0f75b6aac1

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2ae4bcdf5e4c3b156f2a6d947ad6fc0f75b6aac1

[git]

[-- Attachment #1: Type: text/plain, Size: 3171 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  2ae4bcdf5e4c3b156f2a6d947ad6fc0f75b6aac1 (commit)
       via  9b59951690f96f07d35ab59745a8875ddcfd9302 (commit)
      from  351e77b407b29a828f59e1ef6b123f866b4beadf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ae4bcdf5e4c3b156f2a6d947ad6fc0f75b6aac1
Merge: 351e77b 9b59951
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 9 14:12:19 2012 +0200

    Merge remote-tracking branch 'stevee/hplip'

commit 9b59951690f96f07d35ab59745a8875ddcfd9302
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Sep 9 14:07:35 2012 +0200

    hplip: Add support for ssl, add scriptlet to use it with sane.

-----------------------------------------------------------------------

Summary of changes:
 hplip/hplip.nm |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/hplip/hplip.nm b/hplip/hplip.nm
index cd3a8a2..560c64a 100644
--- a/hplip/hplip.nm
+++ b/hplip/hplip.nm
@@ -5,7 +5,7 @@
 
 name       = hplip
 version    = 3.10.9
-release    = 1
+release    = 2
 
 groups     = Applications/Printing
 url        = http://hplipopensource.com/hplip-web/index.html
@@ -13,14 +13,14 @@ license    = GPLv2*
 summary    = HP Printer/Scanner Library (full version).
 
 description
-	HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed \
-	olution for printing, scanning, and faxing with HP inkjet and laser based \
-	printers in Linux. The HPLIP project provides printing support for 1,924 \
-	printer models. \
+	HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed
+	olution for printing, scanning, and faxing with HP inkjet and laser based
+	printers in Linux. The HPLIP project provides printing support for 1,924
+	printer models.
 	This is the full version including printer/scanner support.
 end
 
-source_dl  =
+source_dl  = http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/
 
 build
 	requires
@@ -33,6 +33,7 @@ build
 		libtool
 		libusb-compat-devel
 		net-snmp-devel
+		openssl-devel
 		pkg-config
 		python-devel
 		sane-devel
@@ -40,10 +41,26 @@ build
 
 	configure_options += \
 		--sysconfdir=/etc
+
+	install_cmds
+		# Remove unwanted files.
+		rm -rvf %{BUILDROOT}%{sysconfdir}/sane.d/
+	end
 end
 
 packages
 	package %{name}
+		prerequires += sane
+
+		script postin
+			# Add hplip scanner support to sane.
+			echo "hpaio" >> %{sysconfdir}/sane.d/dll.conf
+		end
+
+		script postun
+			# Remove hplip scanner support from sane.
+			sed -i "/^hpaio$/d" %{sysconfdir}/sane.d/dll.conf
+		end
 	end
 
 	package %{name}-debuginfo


hooks/post-receive
--
IPFire 3.x development tree