diff --git a/kdeadmin.spec b/kdeadmin.spec index 4803973..2b43c21 100644 --- a/kdeadmin.spec +++ b/kdeadmin.spec @@ -1,102 +1,63 @@ %define rhel 0 -%define debug 0 -%define final 0 %define make_cvs 1 -%define ksysv 0 -%if %{rhel} -%define kuser 0 -%else -%define kuser 1 -%endif - -%define kpackage 0 -%define lilo 0 -%define kdat 1 -%define kcron 1 -%define arts 1 -%define knetworkconf 1 - %define qt_version 3.3.7 %define kdelibs_epoch 6 %define kdebase_epoch 6 -%define appdir %{_datadir}/applications/kde Version: 3.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdeadmin Summary: Administrative tools for KDE. Epoch: 7 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL +URL: http://www.kde.org/ -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Source1: kuser.pam Source2: kuser.pamd Source3: kpackage.pam Source4: kpackage.pamd Source5: kpackagerc +Source6: ksysvrc +Source7: kuserrc Patch0: kdeadmin-3.5.6-knetworkconf-fc-6.patch -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -Requires: kdelibs >= %{kdelibs_epoch}:%{version} Requires: kdebase >= %{kdebase_epoch}:%{version} -Requires: usermode +Requires: kdelibs >= %{kdelibs_epoch}:%{version} +Requires: pkgconfig +Requires(post): xdg-utils +Requires(postun): xdg-utils -BuildRequires: desktop-file-utils +%if %{make_cvs} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel -BuildRequires: kdelibs-devel >= %{version} -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel +%endif +BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version} BuildRequires: rpm-devel -BuildRequires: bzip2-devel -BuildRequires: perl %description The kdeadmin package includes administrative tools for the K Desktop Environment (KDE) including: - - kcron - Crontab editor - kdat - Tape backup tool - kuser - Frontend for configuring users and user groups +kcron, kdat, knetworkconf, kpackage, ksysv, kuser. %prep %setup -q + %patch0 -p1 -b .fc6 -%if ! %{kpackage} +if %{rhel} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in -%endif - -%if ! %{ksysv} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in -%endif - -%if ! %{kuser} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in -%endif - -%if ! %{lilo} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE lilo-config"' >lilo-config/configure.in.in %endif -%if ! %{kdat} - echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kdat"' >kdat/configure.in.in -%endif - -%if ! %{kcron} - echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kcron"' >kcron/configure.in.in -%endif - -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" ksysv/Makefile* lilo-config/qt/Makefile.* - %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -111,16 +72,7 @@ unset QTDIR && . /etc/profile.d/qt.sh --with-rpm \ --with-qt-libraries=$QTDIR/lib \ --disable-gcc-hidden-visibility \ -%if %{arts} == 0 - --without-arts \ -%endif -%if %{final} --enable-final \ -%endif -%if %{debug} - --enable-debug \ - --disable-warnings \ -%endif --with-private-groups make %{?_smp_mflags} @@ -130,194 +82,84 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} -# don't use, just delete. Our own versions come later. -rm -rf %{buildroot}/etc/pam.d %{buildroot}/etc/security - -# fix absolute symbolic links -( - rpmlist="kcron" - %if %{ksysv} - rpmlist="$rpmlist ksysv" - %endif - %if %{kuser} - rpmlist="$rpmlist kuser" - %endif - mkdir -p %{buildroot}%{_docdir}/HTML/en/common - cd %{buildroot}%{_docdir}/HTML/en - for i in $rpmlist ; do - cd $i && ln -nfs ../common . - cd .. - done -) - -%if %{kuser} - desktop-file-install \ - --vendor "" \ - --dir %{buildroot}%{appdir} \ - --delete-original \ - --add-only-show-in KDE \ - %{buildroot}%{appdir}/kuser.desktop -# Put in some sane defaults - mkdir -p %{buildroot}%{_datadir}/config - cat >%{buildroot}%{_datadir}/config/kuserrc <%{buildroot}%{_datadir}/config/ksysvrc <> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi -%if ! %{lilo} - rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config -%endif +# rpmdocs +for dir in $comps ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done %post -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root) -%{_bindir}/secpolicy -%{_libdir}/kde3/kfile_* -%{_datadir}/services/kfile_* - -%if %{knetworkconf} -%{_libdir}/kde3/kcm_knetwork* -%{_libdir}/pkgconfig/system-tools-backends.pc -%{_datadir}/applications/kde/kcm_knetwork*.desktop -%{_datadir}/apps/knetworkconf -%{_datadir}/icons/*/*/*/*network*.png -%doc %{_docdir}/HTML/en/knetworkconf -%endif - -%if %{kcron} -%{_bindir}/kcron -%{_datadir}/applications/kde/*kcron.desktop -%{_datadir}/icons/*/*/apps/kcron* -%{_datadir}/apps/kcron -%doc %{_docdir}/HTML/en/kcron -%endif - -%if %{kdat} -%{_bindir}/kdat -%{_datadir}/apps/kdat -%{_datadir}/applications/kde/*kdat.desktop -%{_datadir}/icons/*/*/*/kdat.png -%doc %{_docdir}/HTML/en/kdat -%endif - -%if %{kpackage} -%config %{_datadir}/config/kpackagerc -%config %{_datadir}/apps/kpackage/kpackageui.rc -%{_bindir}/kpackage -%{_sbindir}/kpackage -%{_datadir}/apps/kpackage -%{_datadir}/applications/kde/*kpackage.desktop -%{_datadir}/icons/*/*/apps/kpackage* -%{_datadir}/mimelnk/application/x-debian-package.desktop -%config(noreplace) /etc/pam.d/kpackage -%config(noreplace) /etc/security/console.apps/kpackage -%doc %{_docdir}/HTML/en/kpackage -%endif - -%if %{ksysv} -%config %{_datadir}/config/ksysvrc -%{_bindir}/ksysv -%{_datadir}/apps/ksysv -%{_datadir}/applications/kde/*ksysv.desktop -%{_datadir}/icons/*/*/apps/ksysv* -%{_datadir}/mimelnk/application/x-ksysv.desktop -%{_datadir}/mimelnk/text/x-ksysv-log.desktop -%{_datadir}/icons/*/*/actions/toggle_log.png -%doc %{_docdir}/HTML/en/ksysv -%endif - -%if %{kuser} -%config %{_datadir}/config/kuserrc -%{_bindir}/kuser -%{_sbindir}/kuser -%{_datadir}/apps/kuser -%{_datadir}/applications/kde/*kuser.desktop -%{_datadir}/icons/*/*/apps/kuser* -%{_datadir}/config.kcfg/kuser.kcfg -%config(noreplace) /etc/pam.d/kuser -%config(noreplace) /etc/security/console.apps/kuser -%doc %{_docdir}/HTML/en/kuser -%endif - -%if %{lilo} -%{_datadir}/applications/kde/*lilo.desktop -%{_libdir}/kde3/kcm_lilo* -%endif +%doc AUTHORS COPYING README +%doc rpmdocs/* +%{_bindir}/* +%{_datadir}/apps/* +%{_datadir}/applications/kde/*.desktop +%config(noreplace) %{_datadir}/config*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/service*/*.desktop +%{_libdir}/kde3/*.[ls][ao] +%{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 05 2007 Than Ngo - 7:3.5.6-2.fc7 +- cleanup specfiles + * Wed Feb 07 2007 Than Ngo 7:3.5.6-1.fc7 - 3.5.6