Author: qboosh Date: Tue Mar 1 08:53:39 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- really killing applnkdir
---- Files affected:
SPECS:
kylix.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/kylix.spec
diff -u SPECS/kylix.spec:1.14 SPECS/kylix.spec:1.15
--- SPECS/kylix.spec:1.14 Tue Mar 1 03:32:52 2005
+++ SPECS/kylix.spec Tue Mar 1 09:53:33 2005
@@ -1,5 +1,6 @@
# $Revision$, $Date$
#TODO:
+# - spec filename != Name
# - kde applnk to help system does not work (have $RPM_BUILD_ROOT path inside)
# - more subpackages: -bcb -delphi -bcb-ide -delphi-ide -doc
# - spec cleanup required...
@@ -18,7 +19,7 @@
Patch0: %{name}-setup.patch
NoSource: 0
URL: http://www.borland.com/kylix/open/
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{version}-%{release}
Requires: compat-libstdc++-2.9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,19 +48,18 @@
install %{SOURCE1} .
%patch0 -p1
-%build
-
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_bindir}
+# WTF???
install -d $RPM_BUILD_ROOT/home/bin
install -d $RPM_BUILD_ROOT%{_datadir}/doc/kylix3_open-1.0
install -d $RPM_BUILD_ROOT%{_kylixdata}
+# WTF???
install -d $RPM_BUILD_ROOT/usr/local/etc
install -d $RPM_BUILD_ROOT%{_sysconfdir}/kylix
-install -d $RPM_BUILD_ROOT%{_desktopdir}/Development/Kylix
+install -d $RPM_BUILD_ROOT%{_desktopdir}
cat %{SOURCE1} | sed "s:@INSTALL@:$RPM_BUILD_ROOT%{_kylixdata}:" | sed "[EMAIL
PROTECTED]@~$RPM_BUILD_ROOT/home/bin~" > response
@@ -267,20 +267,10 @@
EOF
-cp -f $RPM_BUILD_ROOT%{_kylixdata}/shortcuts/gnome/*
$RPM_BUILD_ROOT%{_desktopdir}/Development/Kylix
-cat > $RPM_BUILD_ROOT%{_desktopdir}/Development/Kylix/.directory << EOF
-[Desktop Entry]
-Name=Kylix
-Name[pl]=Kylix
-Comment=Kylix
-Comment[pl]=Kylix
-#Icon=
-Type=Directory
-EOF
+cp -f $RPM_BUILD_ROOT%{_kylixdata}/shortcuts/gnome/*
$RPM_BUILD_ROOT%{_desktopdir}
oldpath=`pwd`
-cd $RPM_BUILD_ROOT%{_desktopdir}/Development/Kylix
-
+cd $RPM_BUILD_ROOT%{_desktopdir}
for k in *.desktop
do
cat $k | sed "s+$RPM_BUILD_ROOT++" > tmp
@@ -317,9 +307,9 @@
%attr(755,root,root) %{_libdir}/winhelp*.so*
%attr(755,root,root) %{_libdir}/dbkexe*
-%config(noreplace) %{_sysconfdir}/kylix/*
-/usr/local/etc
-%{_desktopdir}/Development/Kylix
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kylix/*
+/usr/local/etc/*
+%{_desktopdir}/*.desktop
%attr(755,root,root) %{_bindir}/*
@@ -338,12 +328,13 @@
%{_kylixdata}/documentation
%{_kylixdata}/lib
-%dir %{_kylixdata}/help/
+%dir %{_kylixdata}/help
%dir %{_kylixdata}/help/bin
-%dir %{_kylixdata}/help/lib
%attr(755,root,root) %{_kylixdata}/help/bin/*
%attr(755,root,root) %{_kylixdata}/help/hyperhelp.sh
+%dir %{_kylixdata}/help/lib
%attr(755,root,root) %{_kylixdata}/help/lib/*.so
+%{_kylixdata}/help/lib/locale
%{_kylixdata}/help/*.cnt
%{_kylixdata}/help/*.fts
%{_kylixdata}/help/*.hlp
@@ -354,7 +345,6 @@
%{_kylixdata}/help/app-defaults
%{_kylixdata}/help/stlport
%{_kylixdata}/help/xprinter
-%{_kylixdata}/help/lib/locale
%attr(755,root,root) %{_kylixdata}/bin/kylixpath
%attr(755,root,root) %{_kylixdata}/bin/bc++
@@ -427,6 +417,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2005/03/01 08:53:33 qboosh
+- really killing applnkdir
+
Revision 1.14 2005/03/01 02:32:52 koorek
- applnkdir->desktopdir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kylix.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
