From 8d09245473806bbeb6e16e625fde359739214ec93a36ba8f37ff48c2916d3a16 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 26 Sep 2012 19:00:16 +0000
Subject: [PATCH] Accepting request 136124 from home:msmeissn:branches:graphics

- split to libgphoto2-6 to allow parallel installation
  with old libgphoto2 (2.4) and to follow shared lib convention.

OBS-URL: https://build.opensuse.org/request/show/136124
OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=85
---
 libgphoto2.changes |  6 ++++++
 libgphoto2.spec    | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/libgphoto2.changes b/libgphoto2.changes
index 5fa05b6..89dacc9 100644
--- a/libgphoto2.changes
+++ b/libgphoto2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 22 16:54:39 UTC 2012 - meissner@suse.com
+
+- split to libgphoto2-6 to allow parallel installation
+  with old libgphoto2 (2.4) and to follow shared lib convention.
+
 -------------------------------------------------------------------
 Fri Sep 21 18:18:24 UTC 2012 - jengelh@inai.de
 
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 75a8ab1..db20c2e 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define major 6
+
 Name:           libgphoto2
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -44,7 +46,12 @@ Release:        0
 Source0:        libgphoto2-%{version}.tar.bz2
 Source1:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Recommends:     %{name}-lang = %{version}
+Recommends:     %{name}-%{major}-lang = %{version}
+
+%package -n libgphoto2-%{major}
+Summary:        A Digital Camera Library
+Group:          Hardware/Camera
+Recommends:     %{name}-%{major}-lang = %{version}
 
 %package devel
 Summary:        Development headers for libgphoto2
@@ -67,6 +74,20 @@ or by running
 
 gphoto2 --list-cameras
 
+%description -n libgphoto2-%{major}
+gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
+and capturing images from a range of supported digital cameras to your
+local hard drive. It does not support digital cameras based on the USB
+storage protocol. Those can be mounted by Linux directly.
+
+As of this time, gPhoto supports around 1200 cameras, listed on:
+
+http://gphoto.org/proj/libgphoto2/support.php
+
+or by running
+
+gphoto2 --list-cameras
+
 %description devel
 gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
 and capturing images from a range of supported digital cameras to your
@@ -74,7 +95,7 @@ local hard drive.
 
 These are its development libraries and headers.
 
-%lang_package
+%lang_package -n libgphoto2-%{major}
 %prep
 %setup -q
 
@@ -94,9 +115,9 @@ make check
 # skip-check-libtool-deps
 export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 %makeinstall
-%{find_lang} libgphoto2-6
+%{find_lang} libgphoto2-%{major}
 %{find_lang} libgphoto2_port-10
-cat libgphoto2-6.lang libgphoto2_port-10.lang > libgphoto2-all.lang
+cat libgphoto2-%{major}.lang libgphoto2_port-10.lang > libgphoto2-all.lang
 pushd packaging/generic
 	export CAMLIBS=$RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/
 	# new style UDEV rules (gudev) which will obsolete HAL fdi files
@@ -117,7 +138,7 @@ mv $fn.new $fn
 find "%buildroot/%_libdir" -type f -name "*.la" -delete
 %fdupes $RPM_BUILD_ROOT
 
-%files
+%files -n libgphoto2-%{major}
 %defattr(-,root,root)
 %{_libdir}/libgphoto2
 %{_libdir}/libgphoto2_port
@@ -130,7 +151,7 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
 %{_mandir}/man3/libgphoto2_port.3*
 /lib/udev/rules.d/40-libgphoto2.rules
 
-%files lang -f libgphoto2-all.lang
+%files -n libgphoto2-%{major}-lang -f libgphoto2-all.lang
 
 %files devel
 %defattr(-,root,root)
@@ -143,8 +164,8 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
 %{_libdir}/pkgconfig/libgphoto2.pc
 %{_libdir}/pkgconfig/libgphoto2_port.pc
 
-%post -p /sbin/ldconfig
+%post -n %name-%major -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %name-%major -p /sbin/ldconfig
 
 %changelog