diff --git a/CASA-auth-token/client/library/linux/Makefile.am b/CASA-auth-token/client/library/linux/Makefile.am index 809fc578..24bbbcb3 100644 --- a/CASA-auth-token/client/library/linux/Makefile.am +++ b/CASA-auth-token/client/library/linux/Makefile.am @@ -69,7 +69,7 @@ DEFINES += -D_LIB64 endif CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES) -LIBS = -lpthread -ldl -lexpat -lcurl -lidn -lssl -lcrypto -lz -lmicasa +LIBS = -lpthread -ldl -lexpat -lcurl -lssl -lcrypto -lz -lmicasa LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(ROOT)/lib/$(TARGET_CFG) OBJDIR = ./$(TARGET_CFG)/$(LIB) diff --git a/CASA-auth-token/client/library/mechanisms/krb5/linux/Makefile.am b/CASA-auth-token/client/library/mechanisms/krb5/linux/Makefile.am index 0dc23daf..c1104a9b 100644 --- a/CASA-auth-token/client/library/mechanisms/krb5/linux/Makefile.am +++ b/CASA-auth-token/client/library/mechanisms/krb5/linux/Makefile.am @@ -64,7 +64,7 @@ SRC_CONF_FILE_NAME = Krb5Authenticate.conf endif CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -lgssapi +LIBS = -lpthread -lc -lgssglue LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(ROOT)/lib/$(TARGET_CFG) OBJDIR = ./$(TARGET_CFG)/$(LIB) diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes index 5aee8f71..236a077f 100644 --- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes +++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Apr 4 15:04:00 CEST 2008 - meissner@suse.de + +- build with gssapi -> gssglue renamed + +------------------------------------------------------------------- +Mon Jan 28 13:48:15 CET 2008 - mmarek@suse.de + +- fixed build with new libcurl-devel package + * added libopenssl-devel to BuildRequires + * removed unnecessary -lidn in library/linux/Makefile.am + ------------------------------------------------------------------- Wed Jan 2 10:51:40 MST 2008 - jluciani@novell.com diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in index 263dc76c..7146e0c1 100644 --- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in +++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in @@ -14,13 +14,13 @@ Name: CASA_auth_token_client %define cfg Release %define debug_opt "" -URL: http://www.novell.com/products -BuildRequires: CASA-devel curl-devel expat gcc-c++ glade-sharp2 glib2-devel krb5-devel libgcc libgssapi libstdc++ libstdc++-devel mono-devel pkgconfig sysvinit update-alternatives +Url: http://www.novell.com/products +BuildRequires: CASA-devel curl-devel expat gcc-c++ glade-sharp2 glib2-devel krb5-devel libgcc libgssapi libopenssl-devel libstdc++ libstdc++-devel mono-devel pkgconfig sysvinit update-alternatives %if %suse_version > 1020 BuildRequires: libexpat-devel %endif %define prefix /usr -License: LGPL +License: LGPL v2.1 or later Group: System/Libraries Autoreqprov: on %define bldno @VERSION@ @@ -56,6 +56,7 @@ Authors: %package -n CASA_auth_token_client-devel +License: LGPL v2.1 or later Summary: Novell CASA Authentication Token Client Development Files Group: Development/Libraries/C and C++ Requires: CASA-devel CASA_auth_token_client @@ -91,9 +92,7 @@ Authors: %build export PATH=.:$PATH:/usr/%_lib/qt3/bin -%if %suse_version > 1000 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fstack-protector" -%endif ./autogen.sh make @@ -123,7 +122,6 @@ install -m 755 %{_lib}/%{cfg}/krb5mech.so %{buildroot}%{prefix}/%{_lib}/CASA/aut install -m 755 %{_lib}/%{cfg}/pwmech.so %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/pwmech.so.%{bldno} # Symbolic Links -ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so.1 ln -sf krb5mech.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/krb5mech.so ln -sf krb5mech.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.1 @@ -140,6 +138,8 @@ install -m 644 %{_lib}/%{cfg}/PwdAuthenticate.conf %{buildroot}/etc/CASA/authtok # Header Files install -m 644 include/casa_c_authtoken.h %{buildroot}%{prefix}/include +# Symbolic Links +ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so %clean rm -rf $RPM_BUILD_ROOT @@ -167,7 +167,6 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/CASA/authtoken/client %dir /etc/CASA/authtoken/client/mechanisms %{prefix}/%{_lib}/libcasa_c_authtoken.so.%{bldno} -%{prefix}/%{_lib}/libcasa_c_authtoken.so %{prefix}/%{_lib}/libcasa_c_authtoken.so.1 %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.%{bldno} %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so @@ -196,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT %files -n CASA_auth_token_client-devel %defattr(-,root,root) %{prefix}/include/casa_c_authtoken.h +%{prefix}/%{_lib}/libcasa_c_authtoken.so %changelog -n CASA_auth_token_client