Author: qboosh Date: Wed Sep 17 18:48:20 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - added endian patch, get endianness info from glibc at compile time - Conflicts for w3c-libwww containing conflicting files from its own libmd5
---- Files affected: SPECS: libmd5.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/libmd5.spec diff -u SPECS/libmd5.spec:1.6 SPECS/libmd5.spec:1.7 --- SPECS/libmd5.spec:1.6 Wed Sep 17 19:58:34 2008 +++ SPECS/libmd5.spec Wed Sep 17 20:48:14 2008 @@ -8,20 +8,11 @@ Group: Libraries Source0: http://dl.sourceforge.net/libmd5-rfc/md5.tar.gz # Source0-md5: 60f1691ece16bedc12dd2aa949cba606 +Patch0: %{name}-endian.patch URL: http://sourceforge.net/projects/libmd5-rfc/ BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%ifarch %{ix86} %{x8664} alpha ia64 -%define specflags -DARCH_IS_BIG_ENDIAN=0 -%endif -%ifarch ppc ppc64 s390 s390x sparc sparcv9 sparc64 -%define specflags -DARCH_IS_BIG_ENDIAN=1 -%endif -%ifarch arm -# detect endianess in runtime. -%endif - %description This is a very small C library implementing RFC1321, the MD5 message digest function. Unlike the existing W3C libmd5, it was written from @@ -40,6 +31,7 @@ Summary(pl.UTF-8): Plik nagłówkowy biblioteki libmd5 Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Conflicts: w3c-libwww-devel < 5.4.0-9 %description devel Header file for libmd5 library. @@ -52,6 +44,7 @@ Summary(pl.UTF-8): Statyczna biblioteka libmd5 Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} +Conflicts: w3c-libwww-static < 5.4.0-9 %description static Static libmd5 library. @@ -61,6 +54,7 @@ %prep %setup -qc +%patch0 -p1 %build # with -prefer-pic you can link libmd5 statically in shared object. @@ -68,8 +62,8 @@ libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -o libmd5.la md5.lo # build and run testcase. -libtool --mode=compile --tag=CC %{__cc} %{rpmcflags} -static -c md5main.c -libtool --mode=link --tag=CC %{__cc} -o test md5main.lo libmd5.la -lm +%{__cc} %{rpmcflags} -c md5main.c +libtool --mode=link --tag=CC %{__cc} -o test md5main.o libmd5.la -lm ./test --test %install @@ -77,7 +71,7 @@ install -d $RPM_BUILD_ROOT%{_libdir} install -D md5.h $RPM_BUILD_ROOT%{_includedir}/md5.h -libtool --mode=install cp libmd5.la $RPM_BUILD_ROOT%{_libdir} +libtool --mode=install install libmd5.la $RPM_BUILD_ROOT%{_libdir} %clean rm -rf $RPM_BUILD_ROOT @@ -106,6 +100,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2008/09/17 18:48:14 qboosh +- added endian patch, get endianness info from glibc at compile time +- Conflicts for w3c-libwww containing conflicting files from its own libmd5 + Revision 1.6 2008/09/17 17:58:34 qboosh - pl, more archs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libmd5.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
