rpms/kdeadmin/FC-5 kdeadmin.spec,1.57,1.58 sources,1.34,1.35
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jun 10 10:25:58 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdeadmin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9850
Modified Files:
kdeadmin.spec sources
Log Message:
3.5.3
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/kdeadmin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeadmin.spec 5 Apr 2006 14:06:50 -0000 1.57
+++ kdeadmin.spec 10 Jun 2006 10:25:55 -0000 1.58
@@ -1,16 +1,17 @@
%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 ksysv 0
%define kpackage 0
%define lilo 0
%define kdat 1
@@ -21,11 +22,12 @@
%define qt_version 3.3.5
%define kdelibs_epoch 6
%define kdebase_epoch 6
+
%define appdir %{_datadir}/applications/kde
%define disable_gcc_check_and_hidden_visibility 1
-Version: 3.5.2
+Version: 3.5.3
Release: 0.1.fc5
Name: kdeadmin
Summary: Administrative tools for KDE.
@@ -43,18 +45,11 @@
Patch1: kde-libtool.patch
-Requires(post,postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires: usermode
-BuildPrereq: zlib-devel
-BuildPrereq: kdelibs-devel >= %{version}
-BuildPrereq: libjpeg-devel
-BuildPrereq: libpng-devel
+BuildPrereq: kdebase-devel >= %{kdebase_epoch}:%{version}
BuildPrereq: rpm-devel
-BuildPrereq: bzip2-devel
-BuildPrereq: perl
BuildPrereq: /usr/bin/desktop-file-install
%description
@@ -187,14 +182,12 @@
%build
unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG"
+FLAGS="%{optflags} -DNDEBUG -DNO_DEBUG"
%if %{debug}
FLAGS="-O0"
%endif
-export KDEDIR=%{_prefix}
-export PATH=$KDEDIR/bin:$PATH
export CFLAGS="$FLAGS"
export CXXFLAGS="$FLAGS"
@@ -222,12 +215,12 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
# don't use, just delete. Our own versions come later.
-rm -rf $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security
+rm -rf %{buildroot}/etc/pam.d %{buildroot}/etc/security
# fix absolute symbolic links
(
@@ -238,8 +231,8 @@
%if %{kuser}
rpmlist="$rpmlist kuser"
%endif
- mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
- cd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+ mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+ cd %{buildroot}%{_docdir}/HTML/en
for i in $rpmlist ; do
cd $i && ln -nfs ../common .
cd ..
@@ -248,8 +241,8 @@
# Put in some sane defaults
%if %{kuser}
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
- cat >$RPM_BUILD_ROOT%{_datadir}/config/kuserrc <<EOF
+ mkdir -p %{buildroot}%{_datadir}/config
+ cat >%{buildroot}%{_datadir}/config/kuserrc <<EOF
[template]
copySkel=true
createHomeDir=true
@@ -260,7 +253,7 @@
%endif
%if %{ksysv}
- cat >$RPM_BUILD_ROOT%{_datadir}/config/ksysvrc <<EOF
+ cat >%{buildroot}%{_datadir}/config/ksysvrc <<EOF
[Other Settings]
Configured=true
[Path Settings]
@@ -271,66 +264,77 @@
EOF
%endif
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps \
- $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/usr/sbin
+mkdir -p %{buildroot}/etc/security/console.apps \
+ %{buildroot}/etc/pam.d %{buildroot}/usr/sbin
# Runkuser through consolehelper
%if %{kuser}
- mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
- install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
- install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kuser
- ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kuser
+ mv %{buildroot}%{_bindir}/kuser %{buildroot}/usr/sbin
+ install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+ install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+ ln -s consolehelper %{buildroot}%{_bindir}/kuser
%endif
%if %{kpackage}
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
- install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
- install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/kpackage
- install -c -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/config
- mv $RPM_BUILD_ROOT/usr/bin/kpackager $RPM_BUILD_ROOT/usr/sbin
- ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kpackager
+ mkdir -p %{buildroot}%{_datadir}/config
+ install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
+ install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
+ install -c -m 644 %{SOURCE5} %{buildroot}%{_datadir}/config
+ mv %{buildroot}%{_bindir}/kpackager %{buildroot}/usr/sbin
+ ln -s consolehelper %{buildroot}%{_bindir}/kpackager
%endif
%if ! %{kcron}
- rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kcron
+ rm -rf %{buildroot}%{_docdir}/HTML/en/kcron
%endif
%if ! %{kdat}
- rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdat
+ rm -rf %{buildroot}%{_docdir}/HTML/en/kdat
%endif
%if ! %{kpackage}
- rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kpackage
+ rm -rf %{buildroot}%{_docdir}/HTML/en/kpackage
%endif
%if ! %{ksysv}
- rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksysv
+ rm -rf %{buildroot}%{_docdir}/HTML/en/ksysv
%endif
%if ! %{kuser}
- rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kuser
+ rm -rf %{buildroot}%{_docdir}/HTML/en/kuser
%endif
%if ! %{lilo}
- rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/lilo-config
+ rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config
%endif
desktop-file-install \
--vendor "" \
- --dir $RPM_BUILD_ROOT%{appdir} \
+ --dir %{buildroot}%{appdir} \
--delete-original \
--add-only-show-in KDE \
- $RPM_BUILD_ROOT%{appdir}/kuser.desktop
-
-%post -p /sbin/ldconfig
+ %{buildroot}%{appdir}/kuser.desktop
-%postun -p /sbin/ldconfig
+%post
+for f in crystalsvg hicolor locolor ; do
+ touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor locolor ; do
+ touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root)
+%doc AUTHORS COPYING README
%{_bindir}/secpolicy
%{_libdir}/kde3/kfile_*
%{_datadir}/services/kfile_*
@@ -405,6 +409,9 @@
%endif
%changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
+- update to 3.5.3
+
* Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
- update to 3.5.2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 5 Apr 2006 14:06:50 -0000 1.34
+++ sources 10 Jun 2006 10:25:55 -0000 1.35
@@ -1 +1 @@
-ad1f645ed9f140a7c9ce8602cc0c88b8 kdeadmin-3.5.2.tar.bz2
+842e74881c89a719423bbd5cc1f4e226 kdeadmin-3.5.3.tar.bz2
More information about the fedora-cvs-commits
mailing list