rpms/aplus-fsf/FC-6 aplus-fsf-4.20-makefile.patch, 1.3, 1.4 aplus-fsf.spec, 1.5, 1.6
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Mon Dec 11 18:59:44 UTC 2006
Author: s4504kr
Update of /cvs/extras/rpms/aplus-fsf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31869
Modified Files:
aplus-fsf-4.20-makefile.patch aplus-fsf.spec
Log Message:
Change versioning schema
aplus-fsf-4.20-makefile.patch:
Index: aplus-fsf-4.20-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/FC-6/aplus-fsf-4.20-makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aplus-fsf-4.20-makefile.patch 6 Dec 2006 16:39:54 -0000 1.3
+++ aplus-fsf-4.20-makefile.patch 11 Dec 2006 18:59:14 -0000 1.4
@@ -1,118 +1,86 @@
--- aplus-fsf-4.20/src/IPC/Makefile.am.org 2001-01-19 21:38:33.000000000 +0100
-+++ aplus-fsf-4.20/src/IPC/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -52,6 +52,12 @@
++++ aplus-fsf-4.20/src/IPC/Makefile.am 2006-12-10 23:05:42.000000000 +0100
+@@ -52,6 +52,8 @@
pString_Connection.H\
pString_Listener.H
-+libIPC_version = -release $(APLVERSION)
-+
-+libIPC_la_LDFLAGS = $(libIPC_version)
-+
+libIPC_la_LIBADD = -L../MSTypes -L../MSIPC -L../a -lMSTypes -L../cxsys -L../dap -lMSIPC -la -lstdc++ -lcxsys -ldap
+
INCLUDES = -I..
idapdir = $(libdir)
--- aplus-fsf-4.20/src/cxs/Makefile.am.org 2001-11-25 21:31:02.000000000 +0100
-+++ aplus-fsf-4.20/src/cxs/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -12,6 +12,12 @@
++++ aplus-fsf-4.20/src/cxs/Makefile.am 2006-12-10 23:04:20.000000000 +0100
+@@ -12,6 +12,8 @@
libcxs_la_SOURCES = S.c
-+libcxs_version = -release $(APLVERSION)
-+
-+libcxs_la_LDFLAGS = $(libcxs_version)
-+
+libcxs_la_LIBADD = -L../a -L../dap -la -ldap
+
INCLUDES = -I..
sdir = $(libdir)
--- aplus-fsf-4.20/src/cxb/Makefile.am.org 2001-01-19 22:28:09.000000000 +0100
-+++ aplus-fsf-4.20/src/cxb/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -13,5 +13,11 @@
++++ aplus-fsf-4.20/src/cxb/Makefile.am 2006-12-10 23:03:38.000000000 +0100
+@@ -13,5 +13,7 @@
libcxb_la_SOURCES = \
binary.c
-+libcxb_version = -release $(APLVERSION)
-+
-+libcxb_la_LDFLAGS = $(libcxb_version)
-+
+libcxb_la_LIBADD = -L../a -L../dap -la -ldap
+
INCLUDES = -I..
--- aplus-fsf-4.20/src/AplusGUI/Makefile.am.org 2001-01-30 21:48:35.000000000 +0100
-+++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -125,5 +125,11 @@
++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2006-12-10 23:03:11.000000000 +0100
+@@ -125,5 +125,7 @@
EnumTables.H\
Macros.H
-+libAplusGUI_version = -release $(APLVERSION)
-+
-+libAplusGUI_la_LDFLAGS = $(libAplusGUI_version)
-+
+libAplusGUI_la_LIBADD = -L../MSGUI -L../MSTypes -L../MSIPC -L../esf -lMSGUI -lMSTypes -lMSIPC -lesf -lstdc++
+
INCLUDES = -I.. -I/usr/X11R6/include
--- aplus-fsf-4.20/src/cxsys/Makefile.am.org 2001-01-19 22:28:29.000000000 +0100
-+++ aplus-fsf-4.20/src/cxsys/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -20,5 +20,11 @@
++++ aplus-fsf-4.20/src/cxsys/Makefile.am 2006-12-10 23:04:40.000000000 +0100
+@@ -20,5 +20,7 @@
impexp.c \
impexp.h
-+libcxsys_version = -release $(APLVERSION)
-+
-+libcxsys_la_LDFLAGS = $(libcxsys_version)
-+
+libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc
+
INCLUDES = -I..
--- aplus-fsf-4.20/src/cxc/Makefile.am.org 2001-01-19 22:28:18.000000000 +0100
-+++ aplus-fsf-4.20/src/cxc/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -15,5 +15,11 @@
++++ aplus-fsf-4.20/src/cxc/Makefile.am 2006-12-10 23:03:55.000000000 +0100
+@@ -15,5 +15,7 @@
cform.c \
cxc.h
-+libcxc_version = -release $(APLVERSION)
-+
-+libcxc_la_LDFLAGS = $(libcxc_version)
-+
+libcxc_la_LIBADD = -L../a -la
+
INCLUDES = -I..
--- aplus-fsf-4.20/src/esf/Makefile.am.org 2001-01-19 22:28:59.000000000 +0100
-+++ aplus-fsf-4.20/src/esf/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -24,5 +24,11 @@
++++ aplus-fsf-4.20/src/esf/Makefile.am 2006-12-10 23:05:25.000000000 +0100
+@@ -24,5 +24,7 @@
kcheck.c \
dyld2.c
-+libesf_version = -release $(APLVERSION)
-+
-+libesf_la_LDFLAGS = $(libesf_version)
-+
+libesf_la_LIBADD = -L../a -L../dap -la -ldap
+
INCLUDES = -I..
--- aplus-fsf-4.20/src/a/Makefile.am.org 2003-12-30 16:27:54.000000000 +0100
-+++ aplus-fsf-4.20/src/a/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -49,6 +49,11 @@
++++ aplus-fsf-4.20/src/a/Makefile.am 2006-12-10 23:02:46.000000000 +0100
+@@ -49,6 +49,7 @@
s.h\
x.h
-+liba_version = -release $(APLVERSION)
-+
-+liba_la_LDFLAGS = $(liba_version)
-+
+liba_la_LIBADD = -L../dap -ldap
CFLAGS = @CFLAGS@ -DBSTUB
-@@ -66,7 +71,7 @@
+@@ -66,7 +67,7 @@
EXTRA_DIST = fsftest.+ apter.+ t.+ dio.+
@@ -121,88 +89,42 @@
a_include_DATA = \
beam.h \
fir.h \
---- aplus-fsf-4.20/src/dap/Makefile.am.org 2001-11-25 21:36:25.000000000 +0100
-+++ aplus-fsf-4.20/src/dap/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -8,9 +8,9 @@
- ## ##
- ###############################################################################
-
--lib_LTLIBRARIES = libdap.la
-+lib_LTLIBRARIES = libdap.la
-
--libdap_la_SOURCES = \
-+libdap_la_SOURCES = \
- BcdPack.c \
- BcdUnpack.c \
- PrAscDecode.c \
-@@ -229,5 +229,9 @@
- tv.h\
- ulto.h
-
-+libdap_version = -release $(APLVERSION)
-+
-+libdap_la_LDFLAGS = $(libdap_version)
-+
- INCLUDES = -I..
-
--- aplus-fsf-4.20/src/MSGUI/Makefile.am.org 2001-01-30 21:49:25.000000000 +0100
-+++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -382,6 +382,12 @@
++++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2006-12-10 23:06:16.000000000 +0100
+@@ -382,6 +382,8 @@
MSWidgetView.H\
MSWindow.H
-+libMSGUI_version = -release $(APLVERSION)
-+
-+libMSGUI_la_LDFLAGS = $(libMSGUI_version)
-+
+libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap -lMSTypes -lMSIPC -ldap -lX11 -lstdc++
+
EXTRA_DIST = \
MSArrayViewInlines.C\
MSCompositeTextInlines.C\
--- aplus-fsf-4.20/src/MSIPC/Makefile.am.org 2001-01-19 21:44:13.000000000 +0100
-+++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -52,6 +52,12 @@
++++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2006-12-10 23:06:39.000000000 +0100
+@@ -52,6 +52,8 @@
MSTimer.H\
MSTv.H
-+libMSIPC_version = -release $(APLVERSION)
-+
-+libMSIPC_la_LDFLAGS = $(libMSIPC_version)
-+
+libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes
+
EXTRA_DIST = MSProtocolConnection.C
INCLUDES = -I..
--- aplus-fsf-4.20/src/MSTypes/Makefile.am.org 2001-01-19 21:46:18.000000000 +0100
-+++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -298,8 +298,11 @@
++++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2006-12-10 23:07:02.000000000 +0100
+@@ -298,8 +298,7 @@
MSTypeMatrix.C\
MSTypeVector.C
-
-+libMSTypes_version = -release $(APLVERSION)
-
-+libMSTypes_la_LDFLAGS = $(libMSTypes_version)
-+
+-
+libMSTypes_la_LIBADD = -L../a -la -lstdc++
INCLUDES = -I..
---- aplus-fsf-4.20/src/main/Makefile.am.org 2005-08-29 03:32:27.000000000 +0200
-+++ aplus-fsf-4.20/src/main/Makefile.am 2006-08-08 17:46:29.000000000 +0200
-@@ -34,7 +34,7 @@
- $(top_srcdir)/src/cxc/libcxc.la \
- $(top_srcdir)/src/esf/libesf.la \
- $(top_srcdir)/src/a/liba.la \
-- $(top_srcdir)/src/dap/libdap.la \
-+ $(top_srcdir)/src/dap/libdap.la \
- $(top_srcdir)/src/MSGUI/libMSGUI.la \
- $(top_srcdir)/src/MSIPC/libMSIPC.la \
- $(top_srcdir)/src/MSTypes/libMSTypes.la
---- aplus-fsf-4.20/src/main/aplus_main.c.org 2006-08-08 17:49:04.000000000 +0200
-+++ aplus-fsf-4.20/src/main/aplus_main.c 2006-08-08 17:54:09.000000000 +0200
+--- aplus-fsf-4.20/src/main/aplus_main.c.org 2005-08-29 16:47:10.000000000 +0200
++++ aplus-fsf-4.20/src/main/aplus_main.c 2006-12-10 22:01:34.000000000 +0100
@@ -64,7 +64,7 @@
static C *_whoseTree = "";
static C *_banner = BANNER;
@@ -213,7 +135,7 @@
static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n";
static I _enable_coredump;
--- aplus-fsf-4.20/src/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2006-08-08 17:46:29.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2006-12-10 22:01:34.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -224,7 +146,7 @@
TrueType_DATA = KAPL.TTF
--- aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am.org 2001-01-19 22:11:24.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2006-08-08 17:46:29.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2006-12-10 22:01:34.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -235,7 +157,7 @@
fonts_pcf_DATA = \
Kapl.alias \
--- aplus-fsf-4.20/src/fonts/X11/Makefile.am.org 2001-01-19 22:10:32.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2006-08-08 17:46:29.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2006-12-10 22:01:34.000000000 +0100
@@ -8,4 +8,4 @@
## ##
###############################################################################
@@ -243,7 +165,7 @@
-SUBDIRS = pcf bdf
+SUBDIRS = pcf
--- aplus-fsf-4.20/src/app-defaults/Makefile.am.org 2001-01-22 21:35:46.000000000 +0100
-+++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2006-08-08 17:46:29.000000000 +0200
++++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2006-12-10 22:01:34.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -254,7 +176,7 @@
appdefaults_DATA = XTerm
--- aplus-fsf-4.20/src/lisp.1/Makefile.am.org 2001-03-09 23:38:09.000000000 +0100
-+++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2006-08-08 17:46:30.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2006-12-10 22:01:34.000000000 +0100
@@ -8,10 +8,9 @@
## ##
###############################################################################
@@ -276,7 +198,7 @@
a-font.el \
aplus.el \
--- aplus-fsf-4.20/src/lisp.0/Makefile.in.org 2005-08-29 05:22:17.000000000 +0200
-+++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2006-08-08 17:46:30.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2006-12-10 22:01:44.000000000 +0100
@@ -69,6 +69,7 @@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -285,7 +207,18 @@
AS = @AS@
AWK = @AWK@
CC = @CC@
-@@ -88,6 +89,7 @@
+@@ -80,6 +81,10 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LN_S = @LN_S@
++LT_AGE = @LT_AGE@
++LT_CURRENT = @LT_CURRENT@
++LT_RELEASE = @LT_RELEASE@
++LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = @PACKAGE@
+@@ -88,6 +93,7 @@
VERSION = @VERSION@
X_INCLUDES = @X_INCLUDES@
X_LIBS = @X_LIBS@
@@ -293,7 +226,7 @@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
-@@ -121,7 +123,7 @@
+@@ -121,7 +127,7 @@
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
@@ -303,7 +236,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--- aplus-fsf-4.20/src/Makefile.am.org 2005-08-29 04:55:30.000000000 +0200
-+++ aplus-fsf-4.20/src/Makefile.am 2006-08-08 17:46:30.000000000 +0200
++++ aplus-fsf-4.20/src/Makefile.am 2006-12-10 22:01:34.000000000 +0100
@@ -9,24 +9,21 @@
###############################################################################
@@ -339,18 +272,19 @@
EXTRA_DIST = LICENSE
--- aplus-fsf-4.20/configure.in.org 2005-08-29 05:22:02.000000000 +0200
-+++ aplus-fsf-4.20/configure.in 2006-08-08 17:46:30.000000000 +0200
-@@ -17,6 +17,9 @@
++++ aplus-fsf-4.20/configure.in 2006-12-10 23:08:05.000000000 +0100
+@@ -17,6 +17,10 @@
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+APLVERSION=4.20.2
++
+AC_SUBST(APLVERSION)
+
AC_PROG_INSTALL
dnl Checks for libraries.
-@@ -43,6 +46,15 @@
+@@ -43,6 +47,15 @@
dnl ], "$LIBS")
dnl ])
Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/FC-6/aplus-fsf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aplus-fsf.spec 6 Dec 2006 16:39:54 -0000 1.5
+++ aplus-fsf.spec 11 Dec 2006 18:59:14 -0000 1.6
@@ -1,3 +1,4 @@
+
%define name aplus-fsf
%define ver 4.20
%define rel 2
@@ -14,7 +15,7 @@
Name: %name
Version: 4.20.2
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPL
Summary: Advanced APL interpreter with s interface
@@ -124,13 +125,13 @@
# Move libs in an other dir to solve conflicts
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf/%{version}
-cp $RPM_BUILD_ROOT/%{_libdir}/lib*.so $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf
-rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.so
+cp $RPM_BUILD_ROOT/%{_libdir}/lib*.so $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf/%{version}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
-echo '%{_libdir}/aplus-fsf' >$RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
+echo '%{_libdir}/aplus-fsf/%{version}' >$RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
mkdir -p $RPM_BUILD_ROOT/%{_lispstart}/aplus-fsf
cp %{SOURCE1} $RPM_BUILD_ROOT/%{_lispstart}/aplus-fsf-init.el
@@ -216,7 +217,7 @@
%files
%defattr(-,root,root,-)
%{_bindir}/a+
-%{_libdir}/aplus-fsf/lib*-%{version}.so
+%{_libdir}/aplus-fsf/
%{_libdir}/a+
%dir %{_x11appdef}
%{_x11appdef}/XTerm-apl
@@ -229,18 +230,6 @@
%files devel
%defattr(-,root,root,-)
%{_includedir}/a+
-%{_libdir}/aplus-fsf/libAplusGUI.so
-%{_libdir}/aplus-fsf/libMSGUI.so
-%{_libdir}/aplus-fsf/libMSIPC.so
-%{_libdir}/aplus-fsf/libMSTypes.so
-%{_libdir}/aplus-fsf/liba.so
-%{_libdir}/aplus-fsf/libcxb.so
-%{_libdir}/aplus-fsf/libcxc.so
-%{_libdir}/aplus-fsf/libcxs.so
-%{_libdir}/aplus-fsf/libcxsys.so
-%{_libdir}/aplus-fsf/libdap.so
-%{_libdir}/aplus-fsf/libesf.so
-%{_libdir}/aplus-fsf/libIPC.so
%doc COPYING
@@ -267,6 +256,9 @@
%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
%Changelog
+* Mon Dec 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-12
+- Change version schema for dynamic libs
+
* Tue Dec 5 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-11
- Fix name conflict in an other way
More information about the scm-commits
mailing list