rpms/kdeaccessibility/devel .cvsignore, 1.15, 1.16 kdeaccessibility.spec, 1.35, 1.36 sources, 1.16, 1.17 kdeaccessibility-3.5.7-desktop-file.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Dec 4 21:21:24 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16534
Modified Files:
.cvsignore kdeaccessibility.spec sources
Removed Files:
kdeaccessibility-3.5.7-desktop-file.patch
Log Message:
* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:3.96.2-2
- minor touchups
- Provides: mono-icon-theme
- drop -libs,-devel subpkgs
* Fri Nov 30 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.2-1
- kde-3.96.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 25 Oct 2007 19:55:48 -0000 1.15
+++ .cvsignore 4 Dec 2007 21:20:49 -0000 1.16
@@ -1,2 +1,3 @@
kdeaccessibility-3.5.7.tar.bz2
kdeaccessibility-3.5.8.tar.bz2
+kdeaccessibility-3.96.2.tar.bz2
Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdeaccessibility.spec 25 Oct 2007 19:55:48 -0000 1.35
+++ kdeaccessibility.spec 4 Dec 2007 21:20:49 -0000 1.36
@@ -1,119 +1,68 @@
-# define to build/include -devel subpkg
-# omitting this: nothing uses it, and so it's not multilib'd -- Rex
-#define devel 1
-
-Summary: K Desktop Environment - Accessibility
-Name: kdeaccessibility
-Epoch: 1
-Version: 3.5.8
-Release: 3%{?dist}
-
-License: GPLv2
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Url: http://accessibility.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-
-# what's this for?
-# anything other than to make rpmlint/desktop-file-install happy? -- Rex
-Patch1: kdeaccessibility-3.5.7-desktop-file.patch
-
-%if ! 0%{?devel}
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
-%endif
-
-Provides: kdeaccessibility3 = %{version}-%{release}
-
-Requires: kdelibs3 >= %{version}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Summary: K Desktop Environment - Accessibility
+Name: kdeaccessibility
+Epoch: 1
+Version: 3.96.2
+Release: 2%{?dist}
+
+Group: User Interface/Desktops
+License: GPLv2
+URL: http://accessibility.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: kdelibs3-devel >= %{version}
BuildRequires: alsa-lib-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXtst-devel
-%endif
+BuildRequires: akode-devel
+BuildRequires: cmake
+BuildRequires: festival
+BuildRequires: flite-devel
+BuildRequires: kde-filesystem >= 4
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdebase-workspace-devel >= %{version}
+
+# Messages from build. Are this packages some maybe missing BRs?
+# -- The KTTSD Epos plugin will be built but the pos executable was not found.
+# -- The KTTSD FreeTTS plugin will be built but the freetts.jar file was not found.
+# -- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
+# -- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
+
+# FIXME/TODO: are there other explicit Requires?
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+Requires: kdelibs4 >= %{version}
+Requires: kdebase-workspace >= %{version}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: mono-icon-theme = %{version}-%{release}
%description
Included with this package are:
* kmag, a screen magnifier,
* kmousetool, a program for people whom it hurts to click the mouse,
* 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
-Provides: kdeaccessibility3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs3-devel
-%description devel
-%{summary}.
%prep
%setup -q
-#patch1 -p1 -b .desktop-file
-
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
- --includedir=%{_includedir}/kde \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependancy-tracking --enable-final
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-desktop-file-install \
- --vendor="" \
- --dir %{buildroot}%{_datadir}/applications/kde \
- --delete-original \
- %{buildroot}%{_datadir}/applnk/Applications/*.desktop ||:
-
-# 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
-
-%if ! 0%{?devel}
-rm -rf %{buildroot}/%{_includedir}/kde/*
-rm -f %{buildroot}%{_libdir}/lib*.so
-%endif
+mkdir -p %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
%clean
@@ -121,47 +70,69 @@
%post
-/sbin/ldconfig ||:
-for icon_theme in mono 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 mono 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
%postun
-/sbin/ldconfig ||:
-for icon_theme in mono 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 mono 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING
-%doc rpmdocs/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/config/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/icons/mono/
-%{_datadir}/service*/*.desktop
-%{_libdir}/lib*.so.*
-%{_libdir}/*.la
-%{_libdir}/kde3/*
-%if 0%{?devel}
-%files devel
+%files
%defattr(-,root,root,-)
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-%endif
+%doc COPYING
+%{_kde4_bindir}/*
+%{_kde4_appsdir}/kbstateapplet/
+%{_kde4_appsdir}/kicker/applets/*
+%{_kde4_appsdir}/kmag/
+%{_kde4_appsdir}/kmousetool/
+%{_kde4_appsdir}/kmouth/
+%{_kde4_appsdir}/kttsd/
+%{_kde4_configdir}/*
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_docdir}/HTML/en/kmag/
+%{_kde4_docdir}/HTML/en/kmousetool/
+%{_kde4_docdir}/HTML/en/kmouth/
+%{_kde4_docdir}/HTML/en/kttsd/
+%{_kde4_iconsdir}/mono/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/*
%changelog
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:3.96.2-2
+- minor touchups
+- Provides: mono-icon-theme
+- drop -libs,-devel subpkgs
+
+* Fri Nov 30 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.2-1
+- kde-3.96.2
+
+* Sat Nov 24 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.1-1
+- kde-3.96.1
+- added epoch in changelog (also backwards)
+
+* Thu Nov 22 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.0-4
+- libs subpkg
+
+* Fri Nov 16 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.0-3
+- BR: kde-filesystem >= 4
+
+* Fri Nov 16 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.0-2
+- BR: libXtst-devel
+- fix copy&paste error in devel package
+
+* Fri Nov 16 2007 Sebastian Vahl <fedora at deadbabylon.de> 1:3.96.0-1
+- Initial version for Fedora
+
* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1:3.5.8-3
- Obsoletes: %%name ... to help out multilib upgrades
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 13 Oct 2007 17:43:58 -0000 1.16
+++ sources 4 Dec 2007 21:20:49 -0000 1.17
@@ -1 +1 @@
-0ede2d48df626aa436dbe6c741d575f1 kdeaccessibility-3.5.8.tar.bz2
+013ca457d71fe7ee5ff4c79ff84f64bd kdeaccessibility-3.96.2.tar.bz2
--- kdeaccessibility-3.5.7-desktop-file.patch DELETED ---
More information about the fedora-extras-commits
mailing list