Author: oden
Date: Tue Oct 31 17:33:04 2006
New Revision: 74579
Added:
packages/cooker/libssh2/current/SOURCES/libssh2-0.14-soname.diff
packages/cooker/libssh2/current/SOURCES/libssh2-0.4-lib64.diff
Removed:
packages/cooker/libssh2/current/SOURCES/libssh2-0.14-soname.diff.bz2
packages/cooker/libssh2/current/SOURCES/libssh2-0.4-lib64.diff.bz2
Modified:
packages/cooker/libssh2/current/SPECS/libssh2.spec
Log:
- bunzip patches
- fix deps
Added: packages/cooker/libssh2/current/SOURCES/libssh2-0.14-soname.diff
==============================================================================
--- (empty file)
+++ packages/cooker/libssh2/current/SOURCES/libssh2-0.14-soname.diff Tue Oct
31 17:33:04 2006
@@ -0,0 +1,14 @@
+--- src/Makefile.in.orig 2006-04-07 22:40:35.000000000 +0200
++++ src/Makefile.in 2006-07-24 00:20:43.000000000 +0200
+@@ -56,7 +56,10 @@
+ all: [EMAIL PROTECTED]@
+
+ [EMAIL PROTECTED]@: $(OBJECTS)
+- $(LDCC) -o [EMAIL PROTECTED]@ $(SHLIB_LDFLAGS) $(OBJECTS) $(LIBS)
$(LDFLAGS)
++ $(LDCC) -o [EMAIL PROTECTED]@.2 $(SHLIB_LDFLAGS) $(OBJECTS) \
++ $(LIBS) $(LDFLAGS) @SHLIB_LDFLAGS@ -Wl,[EMAIL PROTECTED]@.2
++ ln -snf [EMAIL PROTECTED]@.2 libssh2.so
++
+ libssh2.a: $(OBJECTS)
+ rm -f libssh2.a
+ ar q libssh2.a $(OBJECTS)
Added: packages/cooker/libssh2/current/SOURCES/libssh2-0.4-lib64.diff
==============================================================================
--- (empty file)
+++ packages/cooker/libssh2/current/SOURCES/libssh2-0.4-lib64.diff Tue Oct
31 17:33:04 2006
@@ -0,0 +1,24 @@
+diff -Naur libssh2-0.4/Makefile.in libssh2-0.4.oden/Makefile.in
+--- libssh2-0.4/Makefile.in 2004-12-25 00:22:35.000000000 +0100
++++ libssh2-0.4.oden/Makefile.in 2005-01-08 14:02:59.489220133 +0100
+@@ -2,7 +2,7 @@
+ top_srcdir = @top_srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-libdir = @exec_prefix@/lib
++libdir = @libdir@
+ incldir = @prefix@/include
+ distdir = @top_srcdir@/dist
+
+diff -Naur libssh2-0.4/src/Makefile.in libssh2-0.4.oden/src/Makefile.in
+--- libssh2-0.4/src/Makefile.in 2004-12-19 16:54:05.000000000 +0100
++++ libssh2-0.4.oden/src/Makefile.in 2005-01-08 14:03:17.296202829 +0100
+@@ -3,7 +3,7 @@
+ top_srcdir = @top_srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-libdir = @exec_prefix@/lib
++libdir = @libdir@
+ incldir = @prefix@/include
+
+ CC = @CC@
Modified: packages/cooker/libssh2/current/SPECS/libssh2.spec
==============================================================================
--- packages/cooker/libssh2/current/SPECS/libssh2.spec (original)
+++ packages/cooker/libssh2/current/SPECS/libssh2.spec Tue Oct 31 17:33:04 2006
@@ -1,23 +1,23 @@
-%define rname libssh2
-%define version 0.14
-%define release %mkrel 1
+%define rname libssh2
-%define major 2
+%define major 2
%define libname %mklibname ssh %{major}
Summary: A library implementing the SSH2 protocol
Name: %{rname}
-Version: %{version}
-Release: %{release}
+Version: 0.14
+Release: %mkrel 2
Group: System/Libraries
License: BSD
URL: http://www.libssh2.org/
-Source0: %{rname}-%{version}.tar.bz2
-Patch0: libssh2-0.14-soname.diff.bz2
-Patch1: libssh2-0.4-lib64.diff.bz2
+Source0:
http://prdownloads.sourceforge.net/libssh2/%{rname}-%{version}.tar.bz2
+Patch0: libssh2-0.14-soname.diff
+Patch1: libssh2-0.4-lib64.diff
BuildRequires: pkgconfig
BuildRequires: openssl-devel
BuildRequires: zlib-devel
+BuildRequires: libtool
+BuildRequires: autoconf2.5
BuildRoot: %{_tmppath}/%{rname}-%{version}-root
%description
@@ -41,7 +41,8 @@
%package -n %{libname}-devel
Summary: Static library and header files for the %{rname} library
Group: Development/C
-Provides: %{rname}-devel libssh-devel
+Provides: %{rname}-devel = %{version}
+Provides: libssh-devel = %{version}
Requires: %{libname} = %{version}
%description -n %{libname}-devel
@@ -77,8 +78,8 @@
install -m0644 include/*.h %{buildroot}%{_includedir}/
install -m0755 src/libssh2.a %{buildroot}%{_libdir}/
-install -m0755 src/libssh2.so.2 %{buildroot}%{_libdir}/
-ln -snf libssh2.so.2 %{buildroot}%{_libdir}/libssh2.so
+install -m0755 src/libssh2.so.%{major} %{buildroot}%{_libdir}/
+ln -snf libssh2.so.%{major} %{buildroot}%{_libdir}/libssh2.so
%post -n %{libname} -p /sbin/ldconfig
