Author: glen Date: Sun Jul 17 11:04:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - regenerating auto files breaks everything - just copy config.sub for amd64 - fix desktopfile install - now builds and works
---- Files affected: SPECS: oooqs.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/oooqs.spec diff -u SPECS/oooqs.spec:1.22 SPECS/oooqs.spec:1.23 --- SPECS/oooqs.spec:1.22 Sat Jul 16 18:56:12 2005 +++ SPECS/oooqs.spec Sun Jul 17 13:04:05 2005 @@ -9,10 +9,8 @@ Source0: http://download.berlios.de/segfaultskde/%{name}-%{version}.tar.gz # Source0-md5: 5d401aa7250f80734d785d4c286f635b URL: http://segfaultskde.berlios.de/oooqs/ -BuildRequires: autoconf BuildRequires: automake BuildRequires: kdebase-devel >= 3.0.5a -BuildRequires: libtool BuildRequires: qt-devel >= 3.0.5 BuildRequires: rpmbuild(macros) >= 1.129 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,14 +29,8 @@ %setup -q %build -CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" -export CXXFLAGS - -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} -cp -f /usr/share/automake/config.sub . +export CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" +cp -f /usr/share/automake/config.sub admin %configure %{__make} @@ -47,13 +39,11 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} + kde_htmldir=%{_kdedocdir} \ + shelldesktopdir=%{_desktopdir}/kde %find_lang oooqs --with-kde -install -d $RPM_BUILD_ROOT%{_desktopdir}/kde -cp src/oooqs.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde - %clean rm -rf $RPM_BUILD_ROOT @@ -71,6 +61,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2005/07/17 11:04:05 glen +- regenerating auto files breaks everything +- just copy config.sub for amd64 +- fix desktopfile install +- now builds and works + Revision 1.22 2005/07/16 16:56:12 glen - fix for amd64. note: it still doesn't build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/oooqs.spec?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
