Author: shadzik Date: Thu Feb 18 16:46:32 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/kde4-kdewebdev: kde4-kdewebdev.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: packages/kde4-kdewebdev/kde4-kdewebdev.spec diff -u packages/kde4-kdewebdev/kde4-kdewebdev.spec:1.37 packages/kde4-kdewebdev/kde4-kdewebdev.spec:1.38 --- packages/kde4-kdewebdev/kde4-kdewebdev.spec:1.37 Fri Jan 29 00:08:39 2010 +++ packages/kde4-kdewebdev/kde4-kdewebdev.spec Thu Feb 18 17:46:26 2010 @@ -1,32 +1,33 @@ # $Revision$, $Date$ %define _state stable %define orgname kdewebdev +%define qtver 4.6.1 Summary: Web development tools for KDE Summary(es.UTF-8): Uno editor WEB para KDE Summary(pl.UTF-8): Narzędzia do tworzenia WWW dla KDE Summary(pt_BR.UTF-8): Um editor web para o KDE Name: kde4-kdewebdev -Version: 4.3.5 +Version: 4.4.0 Release: 1 License: GPL Group: X11/Development/Tools Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: 1ddc68c5525f0481549c26218c54b86a +# Source0-md5: 2dcc71e90d6592ff88d2f7e983247e02 URL: http://www.kde.org/ -BuildRequires: Qt3Support-devel -BuildRequires: QtSvg-devel +BuildRequires: Qt3Support-devel >= %{qtver} +BuildRequires: QtSvg-devel >= %{qtver} BuildRequires: automoc4 >= 0.9.88 BuildRequires: boost-devel -BuildRequires: cmake >= 2.6.3 +BuildRequires: cmake >= 2.8.0 BuildRequires: kde4-kdelibs-devel >= %{version} BuildRequires: kde4-kdepimlibs-devel >= %{version} BuildRequires: libgcrypt-devel BuildRequires: libxml2-devel >= 1:2.6.0 BuildRequires: libxslt-devel >= 1.0.18 -BuildRequires: phonon-devel -BuildRequires: qt4-build -BuildRequires: qt4-qmake +BuildRequires: phonon-devel >= 4.3.80 +BuildRequires: qt4-build >= %{qtver} +BuildRequires: qt4-qmake >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: ruby-devel BuildRequires: tidy-devel @@ -298,11 +299,10 @@ install -d build cd build %cmake \ - -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ -LIBTIDY_INCLUDE_DIR=%{_includedir} \ - -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ + -DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif @@ -321,10 +321,10 @@ %find_lang kimagemapeditor --with-kde %find_lang klinkstatus --with-kde #%find_lang kommander --with-kde -%find_lang kxsldbg --with-kde +#%find_lang kxsldbg --with-kde #%find_lang quanta --with-kde -%find_lang xsldbg --with-kde -cat xsldbg.lang >> kxsldbg.lang +#%find_lang xsldbg --with-kde +#cat xsldbg.lang >> kxsldbg.lang %clean rm -rf $RPM_BUILD_ROOT @@ -424,28 +424,29 @@ %{_includedir}/kommanderplugin.h %{_includedir}/specials.h -%files kxsldbg -f kxsldbg.lang -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/kxsldbg -%attr(755,root,root) %{_bindir}/xsldbg -%attr(755,root,root) %{_libdir}/kde4/libkxsldbgpart.so -%{_desktopdir}/kde4/kxsldbg.desktop -%{_datadir}/apps/kxsldbgpart -%{_datadir}/apps/kxsldbg -%{_datadir}/apps/xsldbg -%{_datadir}/dbus-1/interfaces/org.kde.kxsldbg.kxsldbg.xml -%{_iconsdir}/hicolor/*/apps/kxsldbg.png -%{_datadir}/kde4/services/kxsldbg_part.desktop -%{_iconsdir}/hicolor/*/actions/run.png -%{_iconsdir}/hicolor/*/actions/xsldbg_*.png -%{_iconsdir}/hicolor/*/actions/step.png -%{_iconsdir}/hicolor/*/actions/next.png -%{_iconsdir}/hicolor/*/actions/1downarrow.png -%{_iconsdir}/hicolor/*/actions/exit.png -%{_iconsdir}/hicolor/*/actions/configure.png -%{_iconsdir}/hicolor/*/actions/mark.png -%{_iconsdir}/hicolor/*/actions/hash.png -%{_mandir}/man1/xsldbg.1* +#%files kxsldbg -f kxsldbg.lang +#%defattr(644,root,root,755) +#%attr(755,root,root) %{_bindir}/kxsldbg +#%attr(755,root,root) %{_bindir}/xsldbg +#%attr(755,root,root) %{_libdir}/kde4/libkxsldbgpart.so +#%{_desktopdir}/kde4/kxsldbg.desktop +#%{_desktopdir}/kde4/xsldbg.desktop +#%{_datadir}/apps/kxsldbgpart +#%{_datadir}/apps/kxsldbg +#%{_datadir}/apps/xsldbg +#%{_datadir}/dbus-1/interfaces/org.kde.kxsldbg.kxsldbg.xml +#%{_iconsdir}/hicolor/*/apps/kxsldbg.png +#%{_datadir}/kde4/services/kxsldbg_part.desktop +#%{_iconsdir}/hicolor/*/actions/run.png +#%{_iconsdir}/hicolor/*/actions/xsldbg_*.png +#%{_iconsdir}/hicolor/*/actions/step.png +#%{_iconsdir}/hicolor/*/actions/next.png +#%{_iconsdir}/hicolor/*/actions/1downarrow.png +#%{_iconsdir}/hicolor/*/actions/exit.png +#%{_iconsdir}/hicolor/*/actions/configure.png +#%{_iconsdir}/hicolor/*/actions/mark.png +#%{_iconsdir}/hicolor/*/actions/hash.png +#%{_mandir}/man1/xsldbg.1* #%files quanta -f quanta.lang #%defattr(644,root,root,755) @@ -468,23 +469,35 @@ * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.37 2010/01/28 23:08:39 shadzik -- 4.3.5 +Revision 1.38 2010/02/18 16:46:26 shadzik +- merged from DEVEL -Revision 1.36 2009/12/04 01:14:31 sparky -- BR: Qt3Support-devel, QtSvg-devel, qt4-build, qt4-qmake +Revision 1.31.2.9 2010/02/04 22:16:12 arekm +- up to 4.4.0 + +Revision 1.31.2.8 2010/02/02 20:56:45 shadzik +- bump up qtver; it's not necessary but we make sure we link with the latest qtver -Revision 1.35 2009/11/28 21:01:12 shadzik -- 4.3.4 +Revision 1.31.2.7 2010/02/02 16:02:03 shadzik +- minor clean up (removing old svn snap stuff) -Revision 1.34 2009/10/31 14:43:04 shadzik -- 4.3.3 +Revision 1.31.2.6 2010/02/02 13:13:09 shadzik +- force cmake 2.8.0 BR -Revision 1.33 2009/10/19 18:23:18 glen -- CMAKE_BUILD_TYPE caps fixing +Revision 1.31.2.5 2010/02/01 07:03:21 shadzik +- 4.4 RC3 + +Revision 1.31.2.4 2009/12/24 02:09:53 shadzik +- 4.4 Beta2 + +Revision 1.31.2.3 2009/12/05 02:48:54 shadzik +- 4.4 beta1 + +Revision 1.31.2.2 2009/12/04 01:15:14 sparky +- BR: Qt3Support-devel, QtSvg-devel, qt4-build, qt4-qmake -Revision 1.32 2009/10/03 11:54:55 shadzik -- 4.3.2 try #1 +Revision 1.31.2.1 2009/10/07 18:53:45 cactus +- up to 4.3.69 Revision 1.31 2009/08/29 15:06:10 shadzik - 4.3.1 @@ -552,7 +565,7 @@ - 4.2 beta1 Revision 1.19.2.6 2008/11/20 15:27:49 shadzik -- BR: cmake >= 2.6.2 +- BR: cmake >= 2.8.0 Revision 1.19.2.5 2008/11/20 15:18:50 shadzik - 4.1.73 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdewebdev/kde4-kdewebdev.spec?r1=1.37&r2=1.38&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
