rpms/kdeadmin/devel .cvsignore, 1.32, 1.33 kdeadmin.spec, 1.53, 1.54 sources, 1.32, 1.33 kdeadmin-3.4.2-kcron.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10672

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kdeadmin-3.4.2-kcron.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	29 Nov 2005 19:42:02 -0000	1.32
+++ .cvsignore	3 Feb 2006 22:55:09 -0000	1.33
@@ -8,3 +8,4 @@
 kdeadmin-3.4.91.tar.bz2
 kdeadmin-3.4.92.tar.bz2
 kdeadmin-3.5.0.tar.bz2
+kdeadmin-3.5.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdeadmin.spec	9 Dec 2005 22:41:08 -0000	1.53
+++ kdeadmin.spec	3 Feb 2006 22:55:09 -0000	1.54
@@ -16,12 +16,14 @@
 %endif
 
 %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.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -30,18 +32,17 @@
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source6: kuser.pam
-Source7: kuser.pamd
-Source8: kpackage.pam
-Source9: kpackage.pamd
-Source10: kpackagerc
+Source1: kuser.pam
+Source2: kuser.pamd
+Source3: kpackage.pam
+Source4: kpackage.pamd
+Source5: kpackagerc
 
 Patch1: kde-libtool.patch
-Patch2: kdeadmin-3.4.2-kcron.patch
 
-Prereq: /sbin/ldconfig
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires(post,postun): /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
 
 BuildPrereq: zlib-devel
@@ -150,7 +151,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
-%patch2 -p1 -b .kcron_bz168770
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -178,13 +178,6 @@
 
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" ksysv/Makefile* lilo-config/qt/Makefile.*
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -203,9 +196,14 @@
 export CXXFLAGS="$FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --with-rpm \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -214,6 +212,7 @@
 %endif
 %if %{debug}
    --enable-debug \
+   --disable-warnings \
 %endif
    --with-private-groups
 
@@ -275,16 +274,16 @@
 # Runkuser through consolehelper
 %if %{kuser}
   mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
-  install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
-  install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/kuser
+  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
 %endif
 
 %if %{kpackage}
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
-  install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/kpackage
-  install -c -m 644 %{SOURCE10} $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
 %endif
@@ -410,6 +409,9 @@
 %endif
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	29 Nov 2005 19:42:02 -0000	1.32
+++ sources	3 Feb 2006 22:55:09 -0000	1.33
@@ -1 +1 @@
-9d0f914d2d0d3fbef8ed51cfdab36d40  kdeadmin-3.5.0.tar.bz2
+08e9bddd2b42e0783d7f79d08cdb031b  kdeadmin-3.5.1.tar.bz2


--- kdeadmin-3.4.2-kcron.patch DELETED ---