rpms/kdeaccessibility/devel kdeaccessibility.spec,1.24,1.25

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1938

Modified Files:
	kdeaccessibility.spec 
Log Message:
cleanup specfile



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kdeaccessibility.spec	7 Feb 2007 17:46:05 -0000	1.24
+++ kdeaccessibility.spec	26 Feb 2007 18:33:11 -0000	1.25
@@ -2,33 +2,27 @@
 %define final 1
 
 %define qt_version 3.3.7
-%define kdebase_epoch 6
+%define kdelibs_epoch 6
 
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
 License: GPL
-Group: Amusements/Games
+Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Url: http://www.kde.org
+Url: http://accessibility.kde.org/
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-BuildRequires: kdebase-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: perl
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
-BuildRequires: gettext
 
 %description
 Included with this package are:
@@ -37,6 +31,15 @@
 kmouth, program that allows people who have lost their voice
 to let their computer speak for them.
 
+%package devel
+Summary: Development files for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs-devel
+
+%description devel
+Development file for the KDE Accessibility
+
 %prep
 %setup -q
 
@@ -44,19 +47,12 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-gcc-hidden-visibility \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --includedir=%{_includedir}/kde \
-   --with-qt-libraries=$QTDIR/lib
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -67,15 +63,30 @@
 
 rm -rf %{buildroot}%{_includedir}
 
-# Make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   if [ -d $i -a -L $i/common ]; then
-      rm -f %{buildroot}%{_docdir}/HTML/en/$i/common
-      ln -sf ../common %{buildroot}%{_docdir}/HTML/en/$i
-   fi
+# file lists for locale
+%find_lang %{name} || touch %{name}.lang
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}/$HTML_DIR ]; then
+  for lang_dir in %{buildroot}/$HTML_DIR/* ; do
+    if [ -d $lang_dir ]; then
+      lang=$(basename $lang_dir)
+      echo "%lang($lang) $HTML_DIR/$lang/*" >> %{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
+
+# rpmdocs
+for dir in kmag kmousetool ksayit kttsd ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  $dir/$file && install -p -m644 -D $dir/$file rpmdocs/$dir/$file
+  done
 done
-popd
 
 %clean
 rm -rf %{buildroot}
@@ -94,24 +105,34 @@
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
-%doc %{_docdir}/HTML/en/*
+%doc COPYING
+%doc rpmdocs/*
 %{_bindir}/*
-%{_datadir}/applications/kde/*
-%{_datadir}/icons/mono/index.theme
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/applnk/Applications/*
 %{_datadir}/apps/*
-%{_datadir}/config/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%config(noreplace) %{_datadir}/config/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/icons/mono/
 %{_libdir}/*.la
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 %{_libdir}/kde?/*
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/kde/*
+%{_libdir}/lib*.so
+
 
 %changelog
+* Mon Feb 26 2007 Than Ngo <than at redhat.com> - 1:3.5.6-2.fc7
+- cleanup specfile
+
 * Wed Feb 07 2007 Than Ngo <than at redhat.com> 1:3.5.6-1.fc7
 - 3.5.6