[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0038068c61ce274ca414b29020f3314a0247bb64

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0038068c61ce274ca414b29020f3314a0247bb64

[git]

[-- Attachment #1: Type: text/plain, Size: 3093 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  0038068c61ce274ca414b29020f3314a0247bb64 (commit)
       via  73cd5527845625224b7d9fc08f9ea142cda7defe (commit)
      from  2ae4bcdf5e4c3b156f2a6d947ad6fc0f75b6aac1 (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 0038068c61ce274ca414b29020f3314a0247bb64
Merge: 2ae4bcd 73cd552
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 9 17:32:25 2012 +0200

    Merge remote-tracking branch 'stevee/hplip'

commit 73cd5527845625224b7d9fc08f9ea142cda7defe
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Sep 9 17:07:59 2012 +0200

    hplip: Tidy up package.
    
    * Don't build, support for qt4 anymore.
    * Disable build of gui, we don't need it.
    * Splitt package into a lot of subpackages.
    * Remove stuff we don't want to ship.

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

Summary of changes:
 hplip/hplip.nm |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 49 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/hplip/hplip.nm b/hplip/hplip.nm
index 560c64a..b09973a 100644
--- a/hplip/hplip.nm
+++ b/hplip/hplip.nm
@@ -5,7 +5,7 @@
 
 name       = hplip
 version    = 3.10.9
-release    = 2
+release    = 3
 
 groups     = Applications/Printing
 url        = http://hplipopensource.com/hplip-web/index.html
@@ -40,18 +40,65 @@ build
 	end
 
 	configure_options += \
-		--sysconfdir=/etc
+		--sysconfdir=%{sysconfdir} \
+		--disable-gui-build \
+		--disable-qt4
 
 	install_cmds
 		# Remove unwanted files.
+		rm -rvf %{BUILDROOT}%{bindir}/hp-systray
 		rm -rvf %{BUILDROOT}%{sysconfdir}/sane.d/
+		rm -rvf %{BUILDROOT}%{datadir}/installer
+
+		# Remove files for HAL.
+		rm -rvf %{BUILDROOT}%{datadir}/hal
+
+		# Remove X11 relevated files.
+		rm -rvf %{BUILDROOT}%{datadir}/applications/
+
+		# Remove xdg files.
+		rm -rvf %{BUILDROOT}%{sysconfdir}/xdg/
 	end
 end
 
 packages
 	package %{name}
+		requires
+			%{name}-common=%{thisver}
+			cups
+		end
+	end
+
+	package %{name}-common
+		summary = Files needed by the HPLIP printer and scanner drivers.
+		description = %{summary}
+
+		files
+			%{libdir}/udev/
+			%{libdir}/python*/
+			%{sysconfdir}/udev/
+			%{datadir}/hplip
+		end
+	end
+
+	package %{name}-libs
+		template LIBS
+	end
+	
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package libsane-hpaio
+		summary = SANE driver for scanners in HP's multi-function devices.
+		description = %{summary}
+
 		prerequires += sane
 
+		files
+			%{libdir}/sane/*
+		end
+
 		script postin
 			# Add hplip scanner support to sane.
 			echo "hpaio" >> %{sysconfdir}/sane.d/dll.conf


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