rpms/eb/FC-6 eb-aclocal-conf-libdir.patch,NONE,1.1 eb.spec,1.1,1.2

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/eb/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20911

Modified Files:
	eb.spec 
Added Files:
	eb-aclocal-conf-libdir.patch 
Log Message:
sync with devel branch:
- eb-devel requires zlib-devel (#228243)
- move eb.conf build config file to eb-devel and libdir
- add eb-aclocal-conf-libdir.patch to update eb.conf location


eb-aclocal-conf-libdir.patch:

--- NEW FILE eb-aclocal-conf-libdir.patch ---
--- eb-4.3/m4/eb4.m4~	2006-06-28 17:20:01.000000000 +1000
+++ eb-4.3/m4/eb4.m4	2007-02-14 13:10:47.000000000 +1000
@@ -49,8 +49,8 @@
 dnl *
 AC_ARG_WITH(eb-conf,
 AC_HELP_STRING([--with-eb-conf=FILE],
-    [eb.conf file is FILE [[SYSCONFDIR/eb.conf]]]),
-[ebconf="${withval}"], [ebconf=$sysconfdir/eb.conf])
+    [eb.conf file is FILE [[LIBDIR/eb.conf]]]),
+[ebconf="${withval}"], [ebconf=$libdir/eb.conf])
 if test X$prefix = XNONE; then
    PREFIX=$ac_default_prefix
 else


Index: eb.spec
===================================================================
RCS file: /cvs/extras/rpms/eb/FC-6/eb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eb.spec	14 Feb 2007 01:04:45 -0000	1.1
+++ eb.spec	20 Feb 2007 01:06:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           eb
 Version:        4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for accessing Japanese CD-ROM electronic books
 Summary(ja):    CD-ROM 書籍にアクセスするためのライブラリ
 
@@ -9,6 +9,7 @@
 URL:            http://www.sra.co.jp/people/m-kasahr/eb/
 Source0:        ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         eb-aclocal-conf-libdir.patch
 
 BuildRequires:  zlib-devel
 Requires(post): /sbin/ldconfig
@@ -29,6 +30,7 @@
 Summary:        Development files for eb
 Group:          Development/Libraries
 Requires:       eb = %{version}
+Requires:       zlib-devel
 
 %description devel
 This package contains development files needs to use eb in programs.
@@ -36,10 +38,11 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-etc~
 
 
 %build
-%configure --disable-static
+%configure --disable-static --sysconfdir=%{_libdir}
 make %{?_smp_mflags}
 
 
@@ -71,7 +74,6 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-%config(noreplace) %{_sysconfdir}/eb.conf
 %{_bindir}/*
 %{_libdir}/libeb.so.*
 %{_datadir}/eb
@@ -81,10 +83,16 @@
 %defattr(-,root,root,-)
 %doc tmp/html
 %{_includedir}/eb
+%{_libdir}/eb.conf
 %{_libdir}/libeb.so
 %{_datadir}/aclocal/*
 
 
 %changelog
+* Wed Feb 14 2007 Jens Petersen <petersen at redhat.com> - 4.3-2
+- eb-devel requires zlib-devel (#228243)
+- move eb.conf build config file to eb-devel and libdir
+- add eb-aclocal-conf-libdir.patch to update eb.conf location
+
 * Mon Feb 12 2007 Jens Petersen <petersen at redhat.com> - 4.3-1
-- initial packaging for Fedora
+- initial packaging for Fedora (#228241)