Author: qboosh                       Date: Thu Mar 10 21:37:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- resolved conflict with heimdal (by fixing heimdal >= 0.6.3-2)
- added tinfo,man patches; -devel R: ncurses-devel

---- Files affected:
SPECS:
   libedit.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/libedit.spec
diff -u SPECS/libedit.spec:1.3 SPECS/libedit.spec:1.4
--- SPECS/libedit.spec:1.3      Mon Mar  7 22:32:42 2005
+++ SPECS/libedit.spec  Thu Mar 10 22:37:37 2005
@@ -1,18 +1,21 @@
 # $Revision$, $Date$
-# TODO: resolve conflict with heimdal (use shared editline in heimdal?)
-# remove (static-only) libeditline (+devel) from heimdal
-%define        snap    20041207
 Summary:       Editline Library
 Summary(pl):   Biblioteka Editline (edytor linii poleceń)
 Name:          libedit
 Version:       2.9
+%define        snap    20041207
 Release:       1
 Epoch:         0
 License:       BSD
 Group:         Libraries
 Source0:       
http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 # Source0-md5: 93bac6ac3451bd1f2066614992154e02
+Patch0:                %{name}-tinfo.patch
+Patch1:                %{name}-man.patch
 URL:           http://www.thrysoee.dk/editline/
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,6 +36,8 @@
 Summary(pl):   Pliki nagłówkowe i dokumentacja programisty do libedit
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      ncurses-devel
+Conflicts:     heimdal-devel <= 0.6.3-1
 
 %description devel
 Header files and development documentation for libedit.
@@ -54,8 +59,15 @@
 
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 LANG=C; export LANG
 LC_ALL=C; export LC_ALL
 CPPFLAGS="-I%{_includedir}/ncurses"
@@ -78,20 +90,19 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog THANKS
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_mandir}/man5/*
+%attr(755,root,root) %{_libdir}/libedit.so.*.*.*
+%{_mandir}/man5/editrc.5*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libedit.so
+%{_libdir}/libedit.la
 %{_includedir}/*
 %{_mandir}/man3/*
-# to be removed after removing libeditline from heimdal?
-%exclude %{_mandir}/man3/editline*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libedit.a
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -99,6 +110,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/03/10 21:37:37  qboosh
+- resolved conflict with heimdal (by fixing heimdal >= 0.6.3-2)
+- added tinfo,man patches; -devel R: ncurses-devel
+
 Revision 1.3  2005/03/07 21:32:42  qboosh
 - pl, more heimdal notes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libedit.spec?r1=1.3&r2=1.4&f=u


_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to