rpms/sane-backends/FC-5 sane-backends-1.0.17-pkgconfig.patch, NONE, 1.1 sane-backends-1.0.18-rpath.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sane-backends.spec, 1.60, 1.61 sources, 1.13, 1.14 sane-backends-1.0.11-rpath.patch, 1.2, NONE sane-backends-1.0.17-newmodels.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 8 09:16:16 UTC 2006
Author: nphilipp
Update of /cvs/dist/rpms/sane-backends/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22965
Modified Files:
.cvsignore sane-backends.spec sources
Added Files:
sane-backends-1.0.17-pkgconfig.patch
sane-backends-1.0.18-rpath.patch
Removed Files:
sane-backends-1.0.11-rpath.patch
sane-backends-1.0.17-newmodels.patch
Log Message:
clean up docs vs. libs pkg split, mark documentation as %%doc
version 1.0.18
unify spec file between OS releases
update rpath patch
remove obsolete newmodels patch
use *.desc created udev rules
split package into sane-backends, -devel, -libs to work around multilib issues (#135172)
require libsane-hpaio to work around #165751
add BuildRequires: gettext (#194163)
add pkg-config support, re-write sane-config to use pkg-config to avoid multilib problems with conflicting sane-config scripts
sane-backends-1.0.17-pkgconfig.patch:
ChangeLog | 7 +++++++
acinclude.m4 | 9 ++++++++-
configure.in | 15 +++++++++++++++
tools/Makefile.in | 14 +++++++++++---
tools/sane-backends.pc.in | 14 ++++++++++++++
tools/sane-config.in | 40 +++-------------------------------------
6 files changed, 58 insertions(+), 41 deletions(-)
--- NEW FILE sane-backends-1.0.17-pkgconfig.patch ---
--- sane-backends-1.0.17/tools/sane-config.in.pkgconfig 2006-05-17 08:33:04.000000000 +0200
+++ sane-backends-1.0.17/tools/sane-config.in 2006-05-17 08:33:04.000000000 +0200
@@ -7,30 +7,10 @@
PACKAGE="@PACKAGE@"
scriptname="sane-config"
-LINKER_RPATH=""
prefix="@prefix@"
exec_prefix="@exec_prefix@"
-LIBS="@LIBS@ @DL_LIB@"
-pkgincludedir="@pkgincludedir@"
-pkglibdir="@pkglibdir@"
-includedir="@includedir@"
-mandir="@mandir@"
-infodir="@infodir@"
-libdir="@libdir@"
-localstatedir="@localstatedir@"
-sysconfdir="@sysconfdir@"
-datadir="@datadir@"
-libexecdir="@libexecdir@"
-sbindir="@sbindir@"
-bindir="@bindir@"
-#${prefix}
-#exec_prefix_set=no
-srcdir="@srcdir@"
-top_srcdir="@top_srcdir@"
-cflags=
-
usage ()
{
echo "Usage: " 1>&2
@@ -83,27 +63,13 @@
exit 1
;;
--ldflags)
-
- if test -z "$LINKER_RPATH"; then
- echo "-L${libdir} @GPHOTO2_LDFLAGS@"
- else
- echo "-L${libdir} @GPHOTO2_LDFLAGS@ ${LINKER_RPATH}${libdir}"
- fi
+ pkg-config --libs-only-L sane-backends
;;
--libs)
- echo "-lsane ${LIBS}"
+ pkg-config --libs sane-backends
;;
--cflags)
- unique_cflags=
- if test "${includedir}" != "/usr/include"; then
- unique_cflags="${unique_cflags} -I${includedir}"
- fi
- for i in $cflags; do
- if test "${i}" != "-I${includedir}"; then
- unique_cflags="${unique_cflags} $i"
- fi
- done
- echo ${unique_cflags}
+ pkg-config --cflags sane-backends
;;
--prefix)
echo ${prefix}
--- /dev/null 2006-05-17 07:23:35.099833750 +0200
+++ sane-backends-1.0.17/tools/sane-backends.pc.in 2006-05-17 08:33:04.000000000 +0200
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+pc_libs=@RESMGR_LIBS@ @DL_LIB@ @IEEE1284_LIBS@ @PTHREAD_LIBS@ @JPEG_LIBS@ @PC_LIBS@
+pc_reqs=@PC_REQS@
+
+Name: SANE Backends
+Description: Backends for SANE, the universal scanner interface
+Version: @VERSION@
+Requires: ${pc_reqs}
+Libs: -L${libdir} -lsane ${pc_libs}
+Cflags:
--- sane-backends-1.0.17/tools/Makefile.in.pkgconfig 2005-10-29 16:41:09.000000000 +0200
+++ sane-backends-1.0.17/tools/Makefile.in 2006-05-17 09:29:12.000000000 +0200
@@ -25,6 +25,7 @@
includedir = @includedir@
oldincludedir = /usr/include
configdir = ${sysconfdir}/sane.d
+pkgconfigdir = ${libdir}/pkgconfig
MKDIR = $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
@@ -65,7 +66,8 @@
DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext \
mustek600iin-off.c sane-config.in sane-desc.c check-usb-chip.c \
- sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk
+ sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk \
+ sane-backends.pc.in
SUBDIRS = hotplug hotplug-ng udev
@@ -79,18 +81,24 @@
all: $(DESTINATIONS)
-install: sane-config sane-find-scanner gamma4scanimage
+install: sane-config sane-backends.pc sane-find-scanner gamma4scanimage
+ $(MKDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir)
+ $(INSTALL_DATA) sane-backends.pc $(DESTDIR)$(pkgconfigdir)/sane-backends.pc
$(INSTALL_SCRIPT) sane-config $(DESTDIR)$(bindir)/sane-config
$(INSTALL_PROGRAM) sane-find-scanner $(DESTDIR)$(bindir)/sane-find-scanner
$(INSTALL_PROGRAM) gamma4scanimage $(DESTDIR)$(bindir)/gamma4scanimage
uninstall:
- rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner $(bindir)/gamma4scanimage
+ rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner $(bindir)/gamma4scanimage $(pkgconfigdir)/sane-backends.pc
sane-config: sane-config.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+sane-backends.pc: sane-backends.pc.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
sane-find-scanner: sane-find-scanner.o check-usb-chip.o ../backend/sane_strstatus.lo \
../sanei/sanei_scsi.lo ../sanei/sanei_usb.lo ../sanei/sanei_init_debug.lo \
../sanei/sanei_config.lo
--- sane-backends-1.0.17/ChangeLog.pkgconfig 2005-12-18 15:41:09.000000000 +0100
+++ sane-backends-1.0.17/ChangeLog 2006-05-17 08:33:04.000000000 +0200
@@ -0,0 +1,7 @@
+2006-05-16 Nils Philippsen <nphilipp at redhat.com>
+
+ * acinclude.m4 configure.in tools/sane-config.in
+ tools/sane-backends.pc.in tools/Makefile.in: add pkg-config support,
+ re-write sane-config to use pkg-config to avoid multilib problems with
+ conflicting sane-config scripts
+
--- sane-backends-1.0.17/acinclude.m4.pkgconfig 2006-05-17 09:30:36.000000000 +0200
+++ sane-backends-1.0.17/acinclude.m4 2006-05-17 08:33:05.000000000 +0200
@@ -194,6 +194,7 @@
# Checks for ieee1284 library, needed for canon_pp backend.
AC_DEFUN([SANE_CHECK_IEEE1284],
[
+ AC_SUBST(IEEE1284_LIBS)
AC_CHECK_HEADER(ieee1284.h, [
AC_CACHE_CHECK([for libieee1284 >= 0.1.5], sane_cv_use_libieee1284, [
AC_TRY_COMPILE([#include <ieee1284.h>], [
@@ -206,6 +207,7 @@
],)
if test "$sane_cv_use_libieee1284" = "yes" ; then
AC_DEFINE(HAVE_LIBIEEE1284,1,[Define to 1 if you have the `ieee1284' library (-lcam).])
+ AC_SUBST(IEEE1284_LIBS, "-lieee1284")
fi
])
@@ -213,6 +215,7 @@
# Checks for pthread support
AC_DEFUN([SANE_CHECK_PTHREAD],
[
+ AC_SUBST(PTHREAD_LIBS)
case "${host_os}" in
darwin*) # currently only enabled on MacOS X
@@ -246,6 +249,7 @@
[Define if pthreads should be used instead of forked processes.])
fi
if test "$have_pthread" = "yes" ; then
+ AC_SUBST(PTHREAD_LIBS, "-lpthread")
CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
fi
AC_MSG_CHECKING([whether to enable pthread support])
@@ -259,6 +263,7 @@
# GPHOTO2 backends.
AC_DEFUN([SANE_CHECK_JPEG],
[
+ AC_SUBST(JPEG_LIBS)
AC_CHECK_LIB(jpeg,jpeg_start_decompress,
[
AC_CHECK_HEADER(jconfig.h,
@@ -271,7 +276,7 @@
sane_correct_jpeg_lib_version_found
#endif
],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg";
- AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
+ AC_SUBST(JPEG_LIBS, "-ljpeg") AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
],)
],)
])
@@ -415,6 +420,7 @@
# Checks for gphoto2 libs, needed by gphoto2 backend
AC_DEFUN([SANE_CHECK_GPHOTO2],
[
+ AC_SUBST(PC_REQS)
AC_ARG_WITH(gphoto2,
AC_HELP_STRING([--with-gphoto2],
[include the gphoto2 backend @<:@default=yes@:>@]),
@@ -444,6 +450,7 @@
LDFLAGS="$LDFLAGS $GPHOTO2_LDFLAGS"
AC_SUBST(GPHOTO2_LDFLAGS)
+ AC_SUBST(PC_REQS, "libgphoto2 $PC_REQS")
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${GPHOTO2_LIBS}"
--- sane-backends-1.0.17/configure.in.pkgconfig 2005-12-18 14:15:15.000000000 +0100
+++ sane-backends-1.0.17/configure.in 2006-05-17 08:33:04.000000000 +0200
@@ -52,6 +52,7 @@
AC_PROG_MAKE_SET
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
+PKG_PROG_PKG_CONFIG
AC_PATH_PROG(SANE_CONFIG_PATH, sane-config, no)
AC_PATH_PROG(MSGFMT, msgfmt$EXEEXT, no)
AC_PATH_PROG(XGETTEXT, xgettext$EXEEXT, no)
@@ -93,6 +94,8 @@
dnl ***********************************************************************
SANE_CHECK_DLL_LIB
dnl Checks for Backend libraries.
+_pc_libs_save="$LIBS"
+LIBS=""
AC_CHECK_LIB(m,sqrt)
AC_CHECK_LIB(scsi, scsireq_enter) # FreeBSD needs this
AC_CHECK_LIB(cam, cam_open_device) # FreeBSD 3+ needs this
@@ -103,6 +106,8 @@
AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(syslog, syslog be) # OS/2 needs -lsyslog, BeOS needs -lbe
fi
+AC_SUBST(PC_LIBS, "$LIBS")
+LIBS="$LIBS $_pc_libs_save"
SANE_CHECK_JPEG
SANE_CHECK_IEEE1284
SANE_CHECK_PTHREAD
@@ -130,19 +135,23 @@
SANE_CHECK_MISSING_HEADERS
+AC_SUBST(RESMGR_LIBS)
AC_CHECK_HEADER(resmgr.h,[
AC_CHECK_LIB(
resmgr,
rsm_open_device,[
AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library])
LIBS="$LIBS -lresmgr"
+ AC_SUBST(RESMGR_LIBS, "-lresmgr")
]
)
])
+AC_SUBST(USBCALLS_LIBS)
AC_CHECK_HEADER(usbcalls.h,[
AC_DEFINE(HAVE_USBCALLS,1,[define if you have the usbcalls library])
LIBS="$LIBS -lusbcalls"
+ AC_SUBST(USBCALLS_LIBS, "-lusbcalls")
],,[
#include <usb.h>
#include <os2.h>])
@@ -259,6 +268,7 @@
fi
dnl libusb on enabled by default (if found)
+AC_SUBST(PC_REQS)
USE_LIBUSB=yes
AC_ARG_ENABLE(libusb,
AC_HELP_STRING([--disable-libusb],
@@ -274,6 +284,10 @@
AC_CHECK_LIB(usb, usb_interrupt_read)
if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then
HAVE_LIBUSB="yes"
+ PKG_CHECK_MODULES(LIBUSB, libusb)
+ if test "${LIBUSB_LIBS}"; then
+ AC_SUBST(PC_REQS, "libusb $PC_REQS")
+ fi
fi
fi
@@ -518,6 +532,7 @@
japi/Makefile backend/Makefile include/Makefile doc/Makefile \
po/Makefile testsuite/Makefile tools/Makefile doc/doxygen-sanei.conf])
AC_CONFIG_FILES([tools/sane-config], [chmod a+x tools/sane-config])
+AC_CONFIG_FILES([tools/sane-backends.pc])
AC_OUTPUT
dnl ***********************************************************************
sane-backends-1.0.18-rpath.patch:
configure | 1 +
tools/sane-config.in | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE sane-backends-1.0.18-rpath.patch ---
--- sane-backends-1.0.18/tools/sane-config.in.rpath 2004-07-09 16:39:05.000000000 +0200
+++ sane-backends-1.0.18/tools/sane-config.in 2006-07-24 16:47:58.000000000 +0200
@@ -7,7 +7,7 @@
PACKAGE="@PACKAGE@"
scriptname="sane-config"
-LINKER_RPATH="@LINKER_RPATH@"
+LINKER_RPATH=""
prefix="@prefix@"
exec_prefix="@exec_prefix@"
--- sane-backends-1.0.18/configure.rpath 2006-07-03 00:22:09.000000000 +0200
+++ sane-backends-1.0.18/configure 2006-07-24 16:50:13.000000000 +0200
@@ -4159,6 +4159,7 @@
esac
fi
+LINKER_RPATH=
{ echo "$as_me:$LINENO: result: $LINKER_RPATH" >&5
echo "${ECHO_T}$LINKER_RPATH" >&6; }
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 20 Dec 2005 12:32:06 -0000 1.13
+++ .cvsignore 8 Sep 2006 09:16:14 -0000 1.14
@@ -1 +1 @@
-sane-backends-1.0.17.tar.gz
+sane-backends-1.0.18.tar.gz
Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sane-backends.spec 25 Apr 2006 13:20:52 -0000 1.60
+++ sane-backends.spec 8 Sep 2006 09:16:14 -0000 1.61
@@ -1,49 +1,56 @@
-# Disable gphoto2 backend by using --without gphoto2
+# --with/--without options:
+# gphoto2: support gphoto2 backend
+# gphoto2_split: ship gphoto2 backend in separate subpackage
+# libs_split: ship libraries in separate subpackage
+# docs_split: ship documentation in separate subpackage
+
%define gphoto2_support 0%{!?_without_gphoto2:1}
+%define gphoto2_split 0%{!?_without_gphoto2:%{?_with_gphoto2_split:1}}
+
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%define libs_split 0%{?!_without_libs_split:1}
+%define docs_split 0%{?_with_docs_split:1}
+%else
+%define libs_split 0%{?_with_libs_split:1}
+%define docs_split 0%{?!_without_docs_split:1}
+%endif
Summary: Scanner access software
Name: sane-backends
-Version: 1.0.17
-Release: 5.fc5.9
+Version: 1.0.18
+Release: 2%{?dist}
License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
Source1: sane.png
-Patch1: sane-backends-1.0.11-rpath.patch
+Patch1: sane-backends-1.0.18-rpath.patch
Patch2: sane-backends-1.0.12-badcode.patch
Patch3: sane-backends-multilib.patch
-Patch4: sane-backends-1.0.17-newmodels.patch
+Patch5: sane-backends-1.0.17-pkgconfig.patch
URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
BuildRequires: autoconf libtool
+BuildRequires: gettext
%if %{gphoto2_support}
BuildRequires: gphoto2-devel
%endif
-Requires: pam >= 0.78-2, udev
+Requires: pam >= 0.78-2
+Requires: udev
+Requires: libsane-hpaio
ExcludeArch: s390 s390x
%description
Scanner Access Now Easy (SANE) is a universal scanner interface. The
SANE application programming interface (API) provides standardized
access to any raster image scanner hardware (flatbed scanner,
-hand-held scanner, video and still cameras, frame-grabbers, etc.). If
-they're using SANE, developers can write image-processing applications
-without having to think about the peculiarities of individual devices.
-SANE also makes it possible to write a device driver once, which can
-then be used by any SANE-compliant application. SANE currently
-includes drivers for some Epson SCSI scanners, HP ScanJet SCSI
-scanners, Microtek SCSI scanners, Mustek SCSI flatbed scanners, PINT
-devices, most UMAX SCSI scanners, Connectix QuickCam, and other SANE
-devices via network. Note that this package does not enable network
-scanning by default. If you wish to enable network scanning, read the
-saned(1) manpage. If you'd like to develop SANE modules, you should
-also install the sane-backends-devel package.
+hand-held scanner, video and still cameras, frame-grabbers, etc.).
%package devel
-Summary: The SANE (a universal scanner interface) development toolkit.
+Summary: SANE development toolkit
Group: Development/Libraries
Requires: sane-backends = %{version}, libusb-devel, libieee1284-devel
+Requires: pkgconfig
%if %{gphoto2_support}
Requires: gphoto2-devel
%endif
@@ -51,16 +58,46 @@
Provides: sane-devel
%description devel
-Static libraries and header files for writing Scanner Access Now Easy
-(SANE) modules. SANE is a universal scanner interface which is
-included in the sane-backends package.
+This package contains static libraries and header files for writing Scanner
+Access Now Easy (SANE) modules.
+%if %{docs_split}
%package docs
Summary: Additional documentation for SANE
Group: Documentation
%description docs
Additional documentation for SANE, a universal scanner interface.
+%endif
+
+%if %{libs_split}
+%package libs
+Summary: SANE libraries
+Group: System Environment/Libraries
+Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: sane-backends <= 1.0.17-12
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%if ! %{docs_split}
+Obsoletes: sane-backends-docs <= 1.0.17-12
+Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
+
+%description libs
+This package contains the SANE libraries which are needed by applications that
+want to access scanners.
+
+%if %{gphoto2_split}
+%package libs-gphoto2
+Summary: SANE libraries for gphoto2
+Group: System Environment/Libraries
+Requires: sane-backends-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libs-gphoto2
+This package contains the SANE libraries which are needed by applications that
+want to access digital cameras.
+%endif
+%endif
%prep
%setup -q
@@ -68,7 +105,7 @@
%patch1 -p1 -b .rpath
%patch2 -p1 -b .badcode
%patch3 -p1 -b .multilib
-%patch4 -p1 -b .newmodels
+%patch5 -p1 -b .pkgconfig
# Fix bug #62847.
perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
@@ -102,62 +139,133 @@
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
rm -f %{buildroot}%{_bindir}/gamma4scanimage
+rm -f %{buildroot}%{_mandir}/man1/gamma4scanimage.1*
rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/
-sh tools/udev/convert-usermap.sh tools/hotplug/libsane.usermap
-
-sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
+sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' tools/udev/libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
%find_lang %name
+
%clean
rm -rf %{buildroot}
+%if %{libs_split}
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%else
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
+%endif
%files -f %{name}.lang
%defattr(-,root,root)
%dir /etc/sane.d
%config(noreplace) /etc/sane.d/*
%{_sysconfdir}/udev/rules.d/*
+%{_mandir}/*/*
+%{_datadir}/pixmaps/sane.png
+
%{_bindir}/sane-find-scanner
%{_bindir}/scanimage
%{_sbindir}/*
+
+%if ! %{libs_split}
%{_libdir}/libsane*.so.*
%dir %{_libdir}/sane
%{_libdir}/sane/*.so.*
-%{_mandir}/*/*
-%{_datadir}/pixmaps/sane.png
-%{_docdir}/*
+%endif
+
+%if ! %{docs_split} && ! %{libs_split}
+%doc %{_docdir}/*
+%else
+%doc %{_docdir}/*
%exclude %{_docdir}/%{name}-%{version}/sane-backends.html
%exclude %{_docdir}/%{name}-%{version}/sane-backends-external.html
%exclude %{_docdir}/%{name}-%{version}/sane-mfgs.html
%exclude %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
%exclude %{_docdir}/%{name}-%{version}/sane.dvi
%exclude %{_docdir}/%{name}-%{version}/sane.ps
+%endif
+
+%if %{libs_split}
+%files libs
+%defattr(-, root, root)
+%{_libdir}/libsane*.so.*
+%dir %{_libdir}/sane
+%{_libdir}/sane/*.so.*
+
+%if ! %{docs_split}
+%doc %{_docdir}/%{name}-%{version}/sane-backends.html
+%doc %{_docdir}/%{name}-%{version}/sane-backends-external.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
+%doc %{_docdir}/%{name}-%{version}/sane.dvi
+%doc %{_docdir}/%{name}-%{version}/sane.ps
+%endif
+
+%if %{gphoto2_split}
+%exclude %{_libdir}/sane/*gphoto2.so.*
+
+%files libs-gphoto2
+%defattr(-, root, root)
+%{_libdir}/sane/*gphoto2.so.*
+%endif
+%endif
+
+%if %{docs_split}
+%files docs
+%defattr(-, root, root)
+%doc %{_docdir}/%{name}-%{version}/sane-backends.html
+%doc %{_docdir}/%{name}-%{version}/sane-backends-external.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
+%doc %{_docdir}/%{name}-%{version}/sane.dvi
+%doc %{_docdir}/%{name}-%{version}/sane.ps
+%endif
%files devel
%defattr(-,root,root)
%{_bindir}/sane-config
+%{_mandir}/man1/sane-config.1*
%{_includedir}/sane
%{_libdir}/libsane*.so
%{_libdir}/sane/*.so
-
-%files docs
-%defattr(-, root, root)
-%{_docdir}/%{name}-%{version}/sane-backends.html
-%{_docdir}/%{name}-%{version}/sane-backends-external.html
-%{_docdir}/%{name}-%{version}/sane-mfgs.html
-%{_docdir}/%{name}-%{version}/sane-mfgs-external.html
-%{_docdir}/%{name}-%{version}/sane.dvi
-%{_docdir}/%{name}-%{version}/sane.ps
+%dir %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/sane-backends.pc
%changelog
-* Tue Apr 25 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.9
+* Fri Sep 08 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-2
+- remove unneeded programs subpackage
+- clean up docs vs. libs pkg split, mark documentation as %%doc
+
+* Mon Jul 24 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-1
+- version 1.0.18
+- unify spec file between OS releases
+- update rpath patch
+- remove obsolete newmodels patch
+- use *.desc created udev rules
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-13.1
+- rebuild
+
+* Fri Jun 09 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-13
+- split package into sane-backends, -devel, -libs, -programs to work around
+ multilib issues (#135172)
+
+* Wed Jun 07 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-12
+- require libsane-hpaio to work around #165751
+
+* Tue Jun 06 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-11
+- add BuildRequires: gettext (#194163)
+
+* Wed May 17 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-10
+- add pkg-config support, re-write sane-config to use pkg-config to avoid
+ multilib problems with conflicting sane-config scripts
+
+* Tue Apr 25 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-9
- add support for Canon Lide 60 scanner (#189726)
* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 20 Dec 2005 12:32:07 -0000 1.13
+++ sources 8 Sep 2006 09:16:14 -0000 1.14
@@ -1 +1 @@
-b51c10da8a81a04e1bae88c9e6556df2 sane-backends-1.0.17.tar.gz
+7ca7e2908e24721471de92cf40c75e60 sane-backends-1.0.18.tar.gz
--- sane-backends-1.0.11-rpath.patch DELETED ---
--- sane-backends-1.0.17-newmodels.patch DELETED ---
More information about the fedora-cvs-commits
mailing list