rpms/aplus-fsf/FC-6 aplus-fsf-4.20-makefile.patch, 1.2, 1.3 aplus-fsf.spec, 1.4, 1.5

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Wed Dec 6 16:40:24 UTC 2006 

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24942

Modified Files:
	aplus-fsf-4.20-makefile.patch aplus-fsf.spec 
Log Message:
Another try to solve a conflict

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aplus-fsf-4.20-makefile.patch	8 Aug 2006 18:27:34 -0000	1.2
+++ aplus-fsf-4.20-makefile.patch	6 Dec 2006 16:39:54 -0000	1.3
@@ -8,7 +8,7 @@
 +
 +libIPC_la_LDFLAGS = $(libIPC_version)
 +
-+libIPC_la_LIBADD = -L../MSTypes -L../MSIPC -L../a -lMSTypes -L../cxsys -L../dap -lMSIPC -la -lstdc++ -lcxsys -ladap
++libIPC_la_LIBADD = -L../MSTypes -L../MSIPC -L../a -lMSTypes -L../cxsys -L../dap -lMSIPC -la -lstdc++ -lcxsys -ldap
 +
  INCLUDES = -I..
  
@@ -23,7 +23,7 @@
 +
 +libcxs_la_LDFLAGS = $(libcxs_version)
 +
-+libcxs_la_LIBADD = -L../a -L../dap -la -ladap
++libcxs_la_LIBADD = -L../a -L../dap -la -ldap
 +
  INCLUDES = -I..
  
@@ -38,7 +38,7 @@
 +
 +libcxb_la_LDFLAGS = $(libcxb_version)
 +
-+libcxb_la_LIBADD = -L../a -L../dap -la -ladap
++libcxb_la_LIBADD = -L../a -L../dap -la -ldap
 +
  INCLUDES = -I..
  
@@ -66,7 +66,7 @@
 +
 +libcxsys_la_LDFLAGS = $(libcxsys_version)
 +
-+libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ladap -lcxc
++libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc
 +
  INCLUDES = -I..
  
@@ -94,7 +94,7 @@
 +
 +libesf_la_LDFLAGS = $(libesf_version)
 +
-+libesf_la_LIBADD = -L../a -L../dap -la -ladap
++libesf_la_LIBADD = -L../a -L../dap -la -ldap
 +
  INCLUDES = -I..
  
@@ -108,7 +108,7 @@
 +
 +liba_la_LDFLAGS = $(liba_version)
 +
-+liba_la_LIBADD = -L../dap -ladap
++liba_la_LIBADD = -L../dap -ldap
  
  CFLAGS = @CFLAGS@ -DBSTUB
  
@@ -128,10 +128,10 @@
  ###############################################################################
  
 -lib_LTLIBRARIES = libdap.la
-+lib_LTLIBRARIES = libadap.la
++lib_LTLIBRARIES = libdap.la
  
 -libdap_la_SOURCES = \
-+libadap_la_SOURCES = \
++libdap_la_SOURCES = \
  	BcdPack.c \
  	BcdUnpack.c \
  	PrAscDecode.c \
@@ -139,9 +139,9 @@
  	tv.h\
  	ulto.h
  
-+libadap_version = -release $(APLVERSION)
++libdap_version = -release $(APLVERSION)
 +
-+libadap_la_LDFLAGS = $(libadap_version)
++libdap_la_LDFLAGS = $(libdap_version)
 +
  INCLUDES = -I..
  
@@ -155,7 +155,7 @@
 +
 +libMSGUI_la_LDFLAGS = $(libMSGUI_version)
 +
-+libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap -lMSTypes -lMSIPC -ladap -lX11 -lstdc++
++libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap -lMSTypes -lMSIPC -ldap -lX11 -lstdc++
 +
  EXTRA_DIST = \
  	MSArrayViewInlines.C\
@@ -197,7 +197,7 @@
  	$(top_srcdir)/src/esf/libesf.la \
  	$(top_srcdir)/src/a/liba.la \
 -	$(top_srcdir)/src/dap/libdap.la \
-+	$(top_srcdir)/src/dap/libadap.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 


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/FC-6/aplus-fsf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aplus-fsf.spec	4 Sep 2006 18:13:31 -0000	1.4
+++ aplus-fsf.spec	6 Dec 2006 16:39:54 -0000	1.5
@@ -14,7 +14,7 @@
 
 Name: %name
 Version: 4.20.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 
 Summary: Advanced APL interpreter with s interface
@@ -122,6 +122,16 @@
 cp $RPM_BUILD_ROOT/%{_libdir}/*.+ $RPM_BUILD_ROOT/%{_libdir}/a+/
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.+ 
 
+# Move libs in an other dir to solve conflicts
+
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf
+
+cp $RPM_BUILD_ROOT/%{_libdir}/lib*.so $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf
+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
+
 mkdir -p $RPM_BUILD_ROOT/%{_lispstart}/aplus-fsf
 cp %{SOURCE1} $RPM_BUILD_ROOT/%{_lispstart}/aplus-fsf-init.el
 
@@ -144,7 +154,6 @@
   chmod 0644 fonts.cache-$fcver
 done
 
-
 popd
 
 pushd $RPM_BUILD_ROOT/%{_ttffonts}/
@@ -207,11 +216,12 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/a+
-%{_libdir}/lib*-%{version}.so
+%{_libdir}/aplus-fsf/lib*-%{version}.so
 %{_libdir}/a+
 %dir %{_x11appdef}
 %{_x11appdef}/XTerm-apl
 %{_fonts}/
+%{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
 
 %doc samples
 %doc ANNOUNCE AUTHORS ChangeLog LICENSE README
@@ -219,18 +229,18 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/a+
-%{_libdir}/libAplusGUI.so
-%{_libdir}/libMSGUI.so
-%{_libdir}/libMSIPC.so
-%{_libdir}/libMSTypes.so
-%{_libdir}/liba.so
-%{_libdir}/libcxb.so
-%{_libdir}/libcxc.so
-%{_libdir}/libcxs.so
-%{_libdir}/libcxsys.so
-%{_libdir}/libadap.so
-%{_libdir}/libesf.so
-%{_libdir}/libIPC.so
+%{_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
 
@@ -241,7 +251,7 @@
 
 %files -n fonts-x11-apl
 %defattr(-,root,root,-)
-%{_x11fonts}/
+%{_x11fonts}/K*
 %ghost %verify(not md5 size mtime) %{_x11fonts}/encodings.dir
 %ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.dir
 %ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.alias
@@ -249,7 +259,7 @@
 
 %files -n fonts-truetype-apl
 %defattr(-,root,root,-)
-%{_ttffonts}/
+%{_ttffonts}/K*
 %ghost %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.dir
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
@@ -257,6 +267,9 @@
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
 
 %Changelog
+* Tue Dec  5 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-11
+- Fix name conflict in an other way
+
 * Mon Sep  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-10
 - Fix apl font problem

More information about the fedora-extras-commits mailing list