rpms/kdeadmin/devel kdeadmin.spec,1.61,1.62
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 17 17:33:07 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9151
Modified Files:
kdeadmin.spec
Log Message:
BR libtool/autoconf
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdeadmin.spec 17 Jul 2006 17:14:33 -0000 1.61
+++ kdeadmin.spec 17 Jul 2006 17:33:04 -0000 1.62
@@ -23,8 +23,6 @@
%define kdebase_epoch 6
%define appdir %{_datadir}/applications/kde
-%define disable_gcc_check_and_hidden_visibility 1
-
Version: 3.5.3
Release: 2
Name: kdeadmin
@@ -46,19 +44,23 @@
# upstream patches
Patch100: kdeadmin-3.5.2-knetworkconf-fedora.patch
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(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: rpm-devel
-BuildPrereq: bzip2-devel
-BuildPrereq: perl
-BuildPrereq: /usr/bin/desktop-file-install
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: zlib-devel
+BuildRequires: kdelibs-devel >= %{version}
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: rpm-devel
+BuildRequires: bzip2-devel
+BuildRequires: perl
+BuildRequires: /usr/bin/desktop-file-install
%description
The kdeadmin package includes administrative tools for the K Desktop
@@ -193,28 +195,14 @@
%build
unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="%{optflags}"
-
-%if %{debug}
- FLAGS="-O0"
-%endif
-
-export KDEDIR=%{_prefix}
-export PATH=$KDEDIR/bin:$PATH
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
%configure \
-%if 0
--enable-new-ldflags \
-%endif
--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
More information about the fedora-cvs-commits
mailing list