rpms/gphoto2/devel gphoto2.spec,1.75,1.76 sources,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27833

Modified Files:
	gphoto2.spec sources 
Log Message:
- don't ship docs in separate tarball, use the internal one



Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gphoto2.spec	8 Dec 2006 12:53:59 -0000	1.75
+++ gphoto2.spec	11 Dec 2006 14:34:02 -0000	1.76
@@ -8,13 +8,12 @@
 %define libpkg libgphoto2
 %define libver 2.3.0
 Version: %{pkgver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
-Source2: gphoto2-2.1.99-installed-doc.tar.bz2
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Source5: gphoto2-config
@@ -69,7 +68,7 @@
 
 ####################################
 %prep
-%setup -q -a 1 -a 2
+%setup -q -a 1
 
 ####################################
 %build
@@ -121,33 +120,14 @@
 install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm
 
-# not building them - bug in gtk-doc
-rm -rf %{buildroot}%{_docdir}/%{name}
-#mv -f %{buildroot}/%{name} installed-doc
-#mv -f %{buildroot}/%{name}-port installed-doc
-#mv -f %{buildroot}/canon installed-doc
-find installed-doc -name '*.sgml' | xargs -r rm
-
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
 rm -rf %{buildroot}%{_libdir}/*.la
 
-# gphoto2-2.1.99
-#eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
-#eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
-
-# ghoto2-2.2.0
-#LIBGPHOTO2_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_CURRENT\],' %{libpkg}-%{libver}/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
-#LIBGPHOTO2_PORT_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_PORT_CURRENT\],' %{libpkg}-%{libver}/libgphoto2_port/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
-
-# the above doesn't get correct numbers -> hardcode them
-LIBGPHOTO2_CURRENT=2
-LIBGPHOTO2_PORT_CURRENT=0
-
 %find_lang %{name}
-%find_lang %{libpkg}-$LIBGPHOTO2_CURRENT
-%find_lang %{libpkg}_port-$LIBGPHOTO2_PORT_CURRENT
+%find_lang %{libpkg}-2
+%find_lang %{libpkg}_port-0
 cat libgphoto2*.lang >> %{name}.lang
 
 
@@ -161,7 +141,6 @@
 mv ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config-${basearch}
 install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config
 
-
 ####################################
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
@@ -205,7 +184,7 @@
 ####################################
 %files devel
 %defattr(-,root,root)
-%doc installed-doc
+%doc %{_docdir}/gphoto2
 %{_bindir}/gphoto2-config*
 %{_bindir}/gphoto2-port-config
 %{_includedir}/gphoto2
@@ -217,6 +196,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Mon Dec 11 2006 Jindrich Novy <jnovy at redhat.com> 2.3.0-2
+- don't ship docs in separate tarball, use the internal one
+
 * Tue Dec  5 2006 Jindrich Novy <jnovy at redhat.com> 2.3.0-1
 - update to 2.3.0
 - enable lockdev


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Dec 2006 13:45:14 -0000	1.14
+++ sources	11 Dec 2006 14:34:03 -0000	1.15
@@ -1,4 +1,3 @@
-584e1fca2dd1e6cd210d59f7944c8ebd  gphoto2-2.1.99-installed-doc.tar.bz2
 5f0bdd099f8649abf58490ffc2b5df5b  gphoto2-config
 d5ec8694f02516f1a154aa949ece551e  gphoto2-2.3.0.tar.bz2
 05bc0199e77ea3434fbe934f792ddeee  libgphoto2-2.3.0.tar.bz2