summaryrefslogtreecommitdiffstats
path: root/kde/kdeadmin
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-01-28 23:52:36 +0100
committersibel <lesibel@free.fr>2011-01-28 23:52:36 +0100
commit3ecadbdde57bc85df5ab948a746134c01cfca3ef (patch)
tree348e33779c689fc857341c9eaeb87d9ab7b7e7ad /kde/kdeadmin
parente7f76f424ef43369745b07a70deea6548a1f8ca5 (diff)
downloadnutyx-extra-3ecadbdde57bc85df5ab948a746134c01cfca3ef.tar.gz
nutyx-extra-3ecadbdde57bc85df5ab948a746134c01cfca3ef.tar.bz2
nutyx-extra-3ecadbdde57bc85df5ab948a746134c01cfca3ef.tar.xz
nutyx-extra-3ecadbdde57bc85df5ab948a746134c01cfca3ef.zip
kdeadmin, correction 4.6.0
Diffstat (limited to 'kde/kdeadmin')
-rwxr-xr-xkde/kdeadmin/Pkgfile20
-rw-r--r--kde/kdeadmin/kdeadmin-4.6.0-syslog-path.patch11
2 files changed, 25 insertions, 6 deletions
diff --git a/kde/kdeadmin/Pkgfile b/kde/kdeadmin/Pkgfile
index 9d7e7c1c2..9745debbc 100755
--- a/kde/kdeadmin/Pkgfile
+++ b/kde/kdeadmin/Pkgfile
@@ -2,24 +2,32 @@
# URL: http://www.kde.org
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
-# Depends on: kdelibs, kdebase-runtime, kdepimlibs, pycups, pyqt, system-config-printer, kdebindings
+# Depends on: cmake, automoc4, kdelibs, kdebase-runtime, kdepimlibs, pycups, pyqt, system-config-printer, kdebindings, docbook-xsl
# Run on: kdelibs,kdebase-runtime,kdepimlibs,pycups,pyqt,system-config-printer,kdebindings
name=kdeadmin
version=4.6.0
-release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
+release=2
+source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2
+ kdeadmin-4.6.0-syslog-path.patch)
build() {
cd $name-*
- sed -i "/kpackage/d" CMakeLists.txt
+ patch -p1 -i ../kdeadmin-4.6.0-syslog-path.patch
+
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
- -Dscriptsdir=/usr/share/apps/knetworkconf/backends \
- -DBUILD_doc=OFF
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DBUILD_kpackage=OFF \
+ -DBUILD_knetworkconf=OFF \
+ -DBUILD_lilo-config=OFF \
+ -DBUILD_strigi-analyzer=OFF
make
make DESTDIR=$PKG install
+
+ find $PKG -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
}
diff --git a/kde/kdeadmin/kdeadmin-4.6.0-syslog-path.patch b/kde/kdeadmin/kdeadmin-4.6.0-syslog-path.patch
new file mode 100644
index 000000000..8a9142bf6
--- /dev/null
+++ b/kde/kdeadmin/kdeadmin-4.6.0-syslog-path.patch
@@ -0,0 +1,11 @@
+--- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100
++++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100
+@@ -39,7 +39,7 @@
+ SystemConfiguration() :
+ GenericLogModeConfiguration(
+ QLatin1String( SYSTEM_LOG_MODE_ID ),
+- QStringList() << QLatin1String( "/var/log/syslog" ),
++ QStringList() << QLatin1String( "/var/log/messages.log" ),
+ QList<int>() << INFORMATION_LOG_LEVEL_ID
+ ) {
+