rpms/kita/devel kita-0.177.3-nonweak-symbol.patch, NONE, 1.1 kita.spec, 1.5, 1.6
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sun Oct 1 16:22:24 UTC 2006
- Previous message: rpms/pl/FC-5 .cvsignore, 1.10, 1.11 pl.spec, 1.30, 1.31 sources, 1.10, 1.11
- Next message: rpms/kita/FC-5 kita-0.177.3-nonweak-symbol.patch, NONE, 1.1 kita.spec, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/kita/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1017
Modified Files:
kita.spec
Added Files:
kita-0.177.3-nonweak-symbol.patch
Log Message:
* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
- Make common directory link again by symlink
- First remove undefined non-weak symbol related to Qt and KDE
(still need fixes for Kita internal undefined symbol).
kita-0.177.3-nonweak-symbol.patch:
--- NEW FILE kita-0.177.3-nonweak-symbol.patch ---
--- ./kita-0.177.3/kita/src/bbs/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/bbs/Makefile.in 2006-09-28 02:08:03.000000000 +0900
@@ -353,7 +353,7 @@
rm -f "$${dir}/so_locations"; \
done
libkitabbs.la: $(libkitabbs_la_OBJECTS) $(libkitabbs_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/board/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/board/Makefile.in 2006-09-28 02:21:26.000000000 +0900
@@ -370,7 +370,7 @@
rm -f "$${dir}/so_locations"; \
done
libkitaboard.la: $(libkitaboard_la_OBJECTS) $(libkitaboard_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KPARTS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/image/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/image/Makefile.in 2006-09-28 02:54:57.000000000 +0900
@@ -357,7 +357,7 @@
rm -f "$${dir}/so_locations"; \
done
libkitaimage.la: $(libkitaimage_la_OBJECTS) $(libkitaimage_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/libkita/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/libkita/Makefile.in 2006-09-28 03:12:51.000000000 +0900
@@ -411,7 +411,7 @@
rm -f "$${dir}/so_locations"; \
done
libkita.la: $(libkita_la_OBJECTS) $(libkita_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS) $(LIB_QT) $(QT_LDFLAGS) $(LIB_KDECORE) $(LIB_KFILE)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/prefs/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/prefs/Makefile.in 2006-09-28 03:20:04.000000000 +0900
@@ -358,7 +358,7 @@
rm -f "$${dir}/so_locations"; \
done
libkitapref.la: $(libkitapref_la_OBJECTS) $(libkitapref_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/thread/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/thread/Makefile.in 2006-09-28 03:26:37.000000000 +0900
@@ -366,7 +366,7 @@
rm -f "$${dir}/so_locations"; \
done
libkitathread.la: $(libkitathread_la_OBJECTS) $(libkitathread_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/write/Makefile.in.link 2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/write/Makefile.in 2006-09-28 03:35:14.000000000 +0900
@@ -358,7 +358,7 @@
rm -f "$${dir}/so_locations"; \
done
libkitawrite.la: $(libkitawrite_la_OBJECTS) $(libkitawrite_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kita.spec 19 Sep 2006 13:16:41 -0000 1.5
+++ kita.spec 1 Oct 2006 16:22:23 -0000 1.6
@@ -3,8 +3,9 @@
Summary: 2ch client for KDE
Name: kita
Version: %{version}
-Release: 9%{?dist}
+Release: 10%{?dist}
Source: http://keihanna.dl.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
+Patch0: kita-0.177.3-nonweak-symbol.patch
License: GPL
URL: http://sourceforge.jp/projects/kita/
Group: Applications/Internet
@@ -24,13 +25,15 @@
%prep
%setup -q
-%build
+%patch0 -p2 -b .link
+
%{__sed} -i.soname \
-e 's|^kita\([\._][lL]\)|libkitamain\1|' \
-e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
-e 's|-avoid-version||' \
kita/src/Makefile.in
+%build
if [ %{_arch} == x86_64 ] ; then
SUF=64
else
@@ -51,7 +54,6 @@
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
-
%{__sed} -i -e 's|Terminal=0|Terminal=false|' \
%{buildroot}/%{name}.desktop
@@ -71,6 +73,7 @@
%{__mkdir} DOC
unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
+ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
# convert encoding
for f in README README.2ch TODO ; do
@@ -108,6 +111,11 @@
%{_datadir}/doc/HTML/en/kita/
%changelog
+* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
+- Make common directory link again by symlink
+- First remove undefined non-weak symbol related to Qt and KDE
+ (still need fixes for Kita internal undefined symbol).
+
* Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-9
- Again move HTML directory to the original.
- Previous message: rpms/pl/FC-5 .cvsignore, 1.10, 1.11 pl.spec, 1.30, 1.31 sources, 1.10, 1.11
- Next message: rpms/kita/FC-5 kita-0.177.3-nonweak-symbol.patch, NONE, 1.1 kita.spec, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list