Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=56f706d1bd5f6d352ad7dd3a2537b3c746835b1f
commit 56f706d1bd5f6d352ad7dd3a2537b3c746835b1f Author: Melko <[email protected]> Date: Fri Jul 5 13:19:11 2013 +0200 kdenetwork-4.10.5-1-x86_64 * version bump diff --git a/source/kde/kdenetwork/FrugalBuild b/source/kde/kdenetwork/FrugalBuild index a50e94c..cc44365 100644 --- a/source/kde/kdenetwork/FrugalBuild +++ b/source/kde/kdenetwork/FrugalBuild @@ -15,15 +15,13 @@ makedepends=("${makedepends[@]}" 'boost>=1.50.0' "kdelibs>=${_F_kde_ver}" \ "kdebase-workspace>=${_F_kde_ver}" "libdbusmenu-qt>=0.8.0" "soprano-backend-redland>=2.7.0" \ "kdepimlibs>=$_F_kde_ver" "kdelibs-compiletime>=$_F_kde_ver") source=("${source[@]}" \ - find_libortp.patch \ - strigi-analyser.diff) -provides=("$pkgname-docs") + find_libortp.patch) +provides=("$pkgname-docs" "$pkgname-sambaconf") conflicts=("${provides[@]}") replaces=("${provides[@]}") sha1sums=("${sha1sums[@]}" \ - '1476122463258ed03160dc01b38caf3eaebaf0e8' \ - '653ad0c3fb581efd37fbb0a899acbbe75f081402') + '1476122463258ed03160dc01b38caf3eaebaf0e8') Qt4="${_F_kde_qtver}" Kde4="${_F_kde_ver}" @@ -51,7 +49,7 @@ subpkgs=("${subpkgs[@]}" 'kopete') subdescs=("${subdescs[@]}" "Kopete is a multi-protocol instant messenger for the KDE Desktop.") subdepends=("${subdepends[@]}" "libotr libkutils>=$Kde4 libkde3support>=$Kde4 libkabc>=$Kde4 libqtnetwork>=$Qt4 libice libxtst libxfixes libxrender libgcc xz>=5.0.3 libxau libxdmcp libv4l libqtsql>=$Qt4 xfsprogs-acl libuuid libldap libkhtml>=$Kde4 libknotify>=$Kde4 qimageblitz qca - libknewstuff>=$Kde4 libidn libkpimidentities>=$Kde4 libdnssd>=$Kde4 libkmime>=$Kde4 libgadu libmsn>=4.2.1 libxslt mediastreamer") + libknewstuff>=$Kde4 libidn libkpimidentities>=$Kde4 libdnssd>=$Kde4 libkmime>=$Kde4 libgadu libmsn>=4.2.1 libxslt") subgroups=("${subgroups[@]}" 'kde kde-minimal') subreplaces=("${subreplaces[@]}" 'sim') subarchs=("${subarchs[@]}" 'i686 x86_64') @@ -80,46 +78,32 @@ subgroups=("${subgroups[@]}" 'kde kde-minimal') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64') -subpkgs=("${subpkgs[@]}" "$pkgname-strigi-analyzer") +subpkgs=("${subpkgs[@]}" "$pkgname-strigi-analyzers") subdescs=("${subdescs[@]}" "Strigi Analyzer for Kdenetworks.") subdepends=("${subdepends[@]}" "libgcc libtiff libqtgui>=$Qt4 libice libxrender libxext libuuid") subgroups=("${subgroups[@]}" 'kde kde-minimal') +subreplaces=("${subreplaces[@]}" 'kdenetwork-strigi-analyzer') +subarchs=("${subarchs[@]}" 'i686 x86_64') + +subpkgs=("${subpkgs[@]}" "$pkgname-filesharing") +subdescs=("${subdescs[@]}" "Front end for KDE to enable or disable , simple ( HOME ) or advanced ( SAMBA , NFS ) file sharing") +subdepends=("${subdepends[@]}" "libkde3support>=$Kde4 libqtgui>=$Qt4 libstdc++ zlib strigi>=0.7.2-2 libqtnetwork>=$Qt4 libqtxml>=$Qt4 + xfsprogs-acl libxrender libice libxtst libxfixes xz>=5.0.3 libqtsql>=$Qt4 libuuid") +subgroups=("${subgroups[@]}" 'kde') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64') _F_kde_subpkgs=("${subpkgs[@]}") -#subpkgs=("${subpkgs[@]}" "$pkgname-filesharing") -#subdescs=("${subdescs[@]}" "Front end for KDE to enable or disable , simple ( HOME ) or advanced ( SAMBA , NFS ) file sharing") -#subdepends=("${subdepends[@]}" "libkde3support>=$Kde4 libqtgui>=$Qt4 libstdc++ zlib strigi>=0.7.2-2 libqtnetwork>=$Qt4 libqtxml>=$Qt4 -# xfsprogs-acl libxrender libice libxtst libxfixes xz>=5.0.3 libqtsql>=$Qt4 libuuid") -#subgroups=("${subgroups[@]}" 'kde') +#subpkgs=("${subpkgs[@]}" "$pkgname-sambaconf") +#subdescs=("${subdescs[@]}" "Samba configuration front end for KDE.") +#subdepends=("${subdepends[@]}" "libkde3support>=$Kde4 libqtgui>=$Qt4 libstdc++ libice libqtxml>=$Qt4 libxtst libxfixes libxrender zlib +# libqtnetwork>=$Qt4 xfsprogs-acl xz>=5.0.3 libqtsql>=$Qt4 libuuid") +#subgroups=("${subgroups[@]}" 'kde kde-minimal') #subreplaces=("${subreplaces[@]}" '') #subarchs=("${subarchs[@]}" 'i686 x86_64') -subpkgs=("${subpkgs[@]}" "$pkgname-sambaconf") -subdescs=("${subdescs[@]}" "Samba configuration front end for KDE.") -subdepends=("${subdepends[@]}" "libkde3support>=$Kde4 libqtgui>=$Qt4 libstdc++ libice libqtxml>=$Qt4 libxtst libxfixes libxrender zlib - libqtnetwork>=$Qt4 xfsprogs-acl xz>=5.0.3 libqtsql>=$Qt4 libuuid") -subgroups=("${subgroups[@]}" 'kde kde-minimal') -subreplaces=("${subreplaces[@]}" '') -subarchs=("${subarchs[@]}" 'i686 x86_64') - rodepends=("${rodepends[@]}" "${subpkgs[@]}") -build() -{ - KDE_make_split - - KDE_project_install filesharing -# Fsplit $pkgname-filesharing usr/share/kde4/services/fileshare* -# Fsplit $pkgname-filesharing usr/lib/kde4/*fileshare* - - ## rest to -samba - Fsplit $pkgname-sambaconf /\* - - KDE_install -} - # optimization OK diff --git a/source/kde/kdenetwork/strigi-analyser.diff b/source/kde/kdenetwork/strigi-analyser.diff deleted file mode 100644 index 04de56d..0000000 --- a/source/kde/kdenetwork/strigi-analyser.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2010-05-22 09:09:56.000000000 +0200 -+++ CMakeLists.txt 2010-05-22 09:11:39.000000000 +0200 -@@ -94,5 +94,7 @@ - macro_optional_add_subdirectory(filesharing) - endif(NOT WIN32) - -+macro_optional_add_subdirectory(strigi-analyzer) -+ - macro_optional_add_subdirectory(doc) - macro_display_feature_log() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
