rpms/kdeaccessibility/F-7 .cvsignore, 1.13, 1.14 kdeaccessibility.spec, 1.32, 1.33 sources, 1.15, 1.16

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Oct 25 02:12:14 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4461

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
sync w/devel, kde-3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Jun 2007 22:44:00 -0000	1.13
+++ .cvsignore	25 Oct 2007 02:11:41 -0000	1.14
@@ -1,12 +1,2 @@
-kdeaccessibility-3.3.2.tar.bz2
-kdeaccessibility-3.4.0-rc1.tar.bz2
-kdeaccessibility-3.4.0.tar.bz2
-kdeaccessibility-3.4.1.tar.bz2
-kdeaccessibility-3.4.2.tar.bz2
-kdeaccessibility-3.4.91.tar.bz2
-kdeaccessibility-3.4.92.tar.bz2
-kdeaccessibility-3.5.0.tar.bz2
-kdeaccessibility-3.5.1.tar.bz2
-kdeaccessibility-3.5.3.tar.bz2
-kdeaccessibility-3.5.4.tar.bz2
 kdeaccessibility-3.5.7.tar.bz2
+kdeaccessibility-3.5.8.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-7/kdeaccessibility.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdeaccessibility.spec	14 Jun 2007 19:23:08 -0000	1.32
+++ kdeaccessibility.spec	25 Oct 2007 02:11:41 -0000	1.33
@@ -1,47 +1,63 @@
-%define qt_version 3.3.8
-%define kdelibs_epoch 6
 
-Version: 3.5.7
-Release: 1%{?dist}
-Epoch: 1
+# 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
-License: GPL
+Name:    kdeaccessibility
+Epoch:   1
+Version: 3.5.8
+Release: 2%{?dist}
+
+License: GPLv2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://accessibility.kde.org/
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch: kdeaccessibility-3.5.7-desktop-file.patch
+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}
+Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
+%endif
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Provides: kdeaccessibility3 = %{version}-%{release}
+
+Requires: kdelibs3 >= %{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: alsa-lib-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires: libXtst-devel
+%endif
 
 %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.
+* 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: kdelibs-devel
-
+Requires: kdelibs3-devel
 %description devel
-Development file for the KDE Accessibility
+%{summary}.
+
 
 %prep
 %setup -q
 
-%patch -p1 -b .desktop-file
+#patch1 -p1 -b .desktop-file
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -49,13 +65,13 @@
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --enable-final
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -92,9 +108,16 @@
   done
 done
 
+%if ! 0%{?devel}
+rm -rf %{buildroot}/%{_includedir}/kde/*
+rm -f  %{buildroot}%{_libdir}/lib*.so
+%endif
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 /sbin/ldconfig ||:
 for icon_theme in mono hicolor locolor ; do
@@ -119,22 +142,44 @@
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/*/
-%config(noreplace) %{_datadir}/config/*
+%{_datadir}/config/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/icons/mono/
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*
 %{_libdir}/*.la
-%{_libdir}/kde?/*
+%{_libdir}/kde3/*
 
+%if 0%{?devel} 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
+%endif
+
 
 %changelog
-* Thu Jun 07 2007 Than Ngo <than at redhat.com> - 1:3.5.7-1.fc7
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1:3.5.8-2
+- Obsoletes: %%name-devel
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1:3.5.8-1
+- kde-3.5.8
+- omit -devel subpkg
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1:3.5.7-3
+- License: GPLv2
+- Provides: kdeaccessibility3(-devel)
+- (Build)Requires: kdelibs3(-devel)
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1:3.5.7-2
+- portability (rhel)
+- omit .desktop patch (doesn't apply)
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1:3.5.7-1
+- cleanup
+
+* Thu Jun 07 2007 Than Ngo <than at redhat.com> - 1:3.5.7-0.1.fc7
 - 3.5.7
 
 * Mon Mar 12 2007 Than Ngo <than at redhat.com> 1:3.5.6-3.fc7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Jun 2007 22:44:00 -0000	1.15
+++ sources	25 Oct 2007 02:11:41 -0000	1.16
@@ -1 +1 @@
-49a3ffc5303a0c59abf9dcfef185f8bc  kdeaccessibility-3.5.7.tar.bz2
+0ede2d48df626aa436dbe6c741d575f1  kdeaccessibility-3.5.8.tar.bz2




More information about the fedora-extras-commits mailing list