Index: ChangeLog =================================================================== RCS file: /cvsroot/xforms/xforms/ChangeLog,v retrieving revision 1.100 diff -u -p -r1.100 ChangeLog --- ChangeLog 6 May 2004 12:21:45 -0000 1.100 +++ ChangeLog 6 May 2004 17:08:32 -0000 @@ -1,5 +1,17 @@ 2004-05-06 Angus Leeming + * configure.ac (SO_VERSION): new variable defining the libtool + version info. Substituted in lib/Makefile.am and xforms.spec.in. + + * lib/Makefile.am (libforms_la_LDFLAGS): use the configure-time + variable @SO_VERSION@ rather than the hard-coded 1:0:0. + + * xforms.spec.in: fix 'Release' and 'Source0' info. + add 'post' and 'postun' scripts to create and remove symbolic links, + respectively. + +2004-05-06 Angus Leeming + * fdesign/fd_spec.c: revert the change made earlier today. Turned out to be used in the demos code... Index: configure.ac =================================================================== RCS file: /cvsroot/xforms/xforms/configure.ac,v retrieving revision 1.11 diff -u -p -r1.11 configure.ac --- configure.ac 30 Mar 2004 13:03:51 -0000 1.11 +++ configure.ac 6 May 2004 17:08:32 -0000 @@ -11,6 +11,10 @@ AM_CONFIG_HEADER([lib/config.h]) AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) AM_MAINTAINER_MODE +### This defines the version number of the installed .so files +### using libtool's versioning system. +AC_SUBST(SO_VERSION, ["1:0:0"]) + # fix the value of the prefixes. test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' Index: xforms.spec.in =================================================================== RCS file: /cvsroot/xforms/xforms/xforms.spec.in,v retrieving revision 1.4 diff -u -p -r1.4 xforms.spec.in --- xforms.spec.in 6 May 2004 11:53:59 -0000 1.4 +++ xforms.spec.in 6 May 2004 17:08:32 -0000 @@ -1,8 +1,8 @@ Summary: XForms library Name: @PACKAGE@ Version: @VERSION@ -Release: 1rh8x -Source0: http://savannah.nongnu.org/download/xforms/stable.pkg/1.0/%{name}-%{version}.tar.gz +Release: 1 +Source0: http://savannah.nongnu.org/download/xforms/%{name}-%{version}.tar.gz License: LGPL Group: System/Libraries BuildRequires: xpm @@ -58,7 +58,38 @@ rm -f %{_tmppath}/%{name}-%{version}-dev %files -n %{name}-devel -f %{_tmppath}/%{name}-%{version}-devfiles %defattr(-,root,root) + +%post -n %{name} +# Create symbolic links from libforms.so.1.0.0 to libforms.so, libforms.so.1 +so_version=`echo @SO_VERSION@ | sed 's/:/./g'` +current_version=`echo ${so_version} | cut -d'.' -f1` +lib_prefix=${RPM_INSTALL_PREFIX}/lib +for lib_name in libforms.so libformsGL.so libflimage.so +do + lib_path="${lib_prefix}/${lib_name}" + ln -sf ${lib_path}.${so_version} ${lib_path} + ln -sf ${lib_path}.${so_version} ${lib_path}.${current_version} +done + + +%postun -n %{name} +# Remove symbolic links libforms.so, libforms.so.1, etc +so_version=`echo @SO_VERSION@ | sed 's/:/./g'` +current_version=`echo ${so_version} | cut -d'.' -f1` +lib_prefix=${RPM_INSTALL_PREFIX}/lib +for lib_name in libforms.so libformsGL.so libflimage.so +do + lib_path="${lib_prefix}/${lib_name}" + rm -f ${lib_path} ${lib_path}.${current_version} +done + + %changelog +* Thu May 6 2004 Angus Leeming 1.0.90 +- fix 'Release' and 'Source0' info. +- add 'post' and 'postun' scripts to create and remove symbolic links, + respectively. + * Thu May 6 2004 Angus Leeming 1.0.90 - no longer place devfiles and binfiles in ${RPM_BUILD_ROOT}. Prevents rpm from bombing with a "Checking for unpackaged files" error. Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/xforms/xforms/lib/Makefile.am,v retrieving revision 1.5 diff -u -p -r1.5 Makefile.am --- lib/Makefile.am 30 Apr 2004 20:43:52 -0000 1.5 +++ lib/Makefile.am 6 May 2004 17:08:44 -0000 @@ -17,7 +17,7 @@ INCLUDES = -DMAKING_FORMS $(X_CFLAGS) lib_LTLIBRARIES = libforms.la -libforms_la_LDFLAGS = -version-info 1:0:0 +libforms_la_LDFLAGS = -version-info @SO_VERSION@ libforms_la_SOURCES = \ align.c \