packages: speech_tools/speech_tools-soname.patch, speech_tools/speech_tools...

qboosh qboosh at pld-linux.org
Sat Apr 7 20:16:40 CEST 2012


Author: qboosh                       Date: Sat Apr  7 18:16:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated soname patch, set proper sonames instead of *.so belonging to -devel

---- Files affected:
packages/speech_tools:
   speech_tools-soname.patch (1.2 -> 1.3) , speech_tools.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: packages/speech_tools/speech_tools-soname.patch
diff -u packages/speech_tools/speech_tools-soname.patch:1.2 packages/speech_tools/speech_tools-soname.patch:1.3
--- packages/speech_tools/speech_tools-soname.patch:1.2	Sat Oct  9 12:24:57 2004
+++ packages/speech_tools/speech_tools-soname.patch	Sat Apr  7 20:16:34 2012
@@ -16,9 +16,20 @@
  	@echo Link Shared Library $*
  	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
 -	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
-+	$(subst YYY,$@,$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
++	$(subst YYY,$@.$(PROJECT_LIBRARY_SOVERSION_$*),$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
  	@$(RM) -f shared_space/*.o $@
  	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
  
-
-
+--- speech_tools/config/project.mak.orig	2012-04-07 10:25:08.664304841 +0200
++++ speech_tools/config/project.mak	2012-04-07 18:57:14.971998561 +0200
+@@ -107,6 +107,10 @@
+ PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_VERSION).1
+ PROJECT_LIBRARY_VERSION_eststring = 1.2
+ PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1
++PROJECT_LIBRARY_SOVERSION_estools = $(PROJECT_VERSION)
++PROJECT_LIBRARY_SOVERSION_estbase = $(PROJECT_VERSION)
++PROJECT_LIBRARY_SOVERSION_eststring = 1
++PROJECT_LIBRARY_SOVERSION_estjava = $(PROJECT_VERSION)
+ 
+ PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1
+ PROJECT_LIBRARY_NEEDS_SYSLIBS_estools=1

================================================================
Index: packages/speech_tools/speech_tools.spec
diff -u packages/speech_tools/speech_tools.spec:1.61 packages/speech_tools/speech_tools.spec:1.62
--- packages/speech_tools/speech_tools.spec:1.61	Sat Apr  7 11:57:58 2012
+++ packages/speech_tools/speech_tools.spec	Sat Apr  7 20:16:34 2012
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - fix libraries SONAME
 # - some utils have too generic names
 Summary:	Edinburgh Speech Tools Library
 Summary(pl.UTF-8):	Biblioteka narzędzi mowy Edinburgh
@@ -158,6 +157,8 @@
 install grammar/scfg/scfg.mak $RPM_BUILD_ROOT%{_libdir}/%{name}/grammar/scfg
 install grammar/wfst/wfst.mak $RPM_BUILD_ROOT%{_libdir}/%{name}/grammar/wfst
 
+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -168,8 +169,11 @@
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_libdir}/libestbase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libestbase.so.2.1
 %attr(755,root,root) %{_libdir}/libestools.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libestools.so.2.1
 %attr(755,root,root) %{_libdir}/libeststring.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libeststring.so.1
 %{_datadir}/%{name}
 
 %files devel
@@ -240,6 +244,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2012/04/07 18:16:34  qboosh
+- updated soname patch, set proper sonames instead of *.so belonging to -devel
+
 Revision 1.61  2012/04/07 09:57:58  qboosh
 - BR: alsa-lib-devel
 - verbose lib/man files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/speech_tools/speech_tools-soname.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/speech_tools/speech_tools.spec?r1=1.61&r2=1.62



More information about the pld-cvs-commit mailing list