- no epoch defined, avoid using it; rel 2

[packages/libxcrypt.git] / libxcrypt.spec

diff --git a/libxcrypt.spec b/libxcrypt.spec
index 122e33d22e25d90e013eeb678aae22f4f44419cb..162a3045f77a22420772bea48967e6420a66bb2c 100644 (file)
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -1,13 +1,15 @@
 Summary:       Crypt Library for DES, MD5, and Blowfish
 Name:          libxcrypt
 Version:       3.0.2
-Release:       1
+Release:       2
 License:       LGPL v2+, Public Domain, Freeware
 Group:         Libraries
 Source0:       ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/%{name}-%{version}.tar.bz2
 # Source0-md5: 56cf4285086f26649b8792b53fe8b00f
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%undefine      __cxx
+
 %description
 Libxcrypt is a replacement for libcrypt, which comes with the GNU C
 Library. It supports DES crypt, MD5, and passwords with blowfish
@@ -16,7 +18,7 @@ encryption.
 %package devel
 Summary:       Header files and develpment documentation for libxcrypt
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files to develop software using
@@ -25,7 +27,7 @@ libxcrypt.
 %package static
 Summary:       Static libxcrypt library
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains the static library used for development.
@@ -46,6 +48,8 @@ install -d $RPM_BUILD_ROOT%{_libdir}
        DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/%{_lib}/lib*.{l,}a $RPM_BUILD_ROOT%{_libdir}
+sed -i -e 's#/%{_lib}#%{_libdir}#g' $RPM_BUILD_ROOT%{_libdir}/*.la
+
 for lib in $RPM_BUILD_ROOT/%{_lib}/lib*.so.*; do
        lib=$(echo $lib | sed -e "s#$RPM_BUILD_ROOT##g")
        slib=$(basename $lib | sed -e 's#\.so\..*#.so#g')
@@ -62,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README*
 %attr(755,root,root) /%{_lib}/libxcrypt.so.*
-%dir  /%{_lib}/xcrypt
+%dir /%{_lib}/xcrypt
 %attr(755,root,root) /%{_lib}/xcrypt/libxcrypt*.so*
 
 %files devel