rpms/choqok/F-11 choqok.spec,1.6,1.7 sources,1.5,1.6

[Tejas Dinkar]

Author: tejas

Update of /cvs/pkgs/rpms/choqok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25199

Modified Files:
	choqok.spec sources 
Log Message:
Updating to Choqok 1.0 beta



Index: choqok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-11/choqok.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- choqok.spec	16 Aug 2009 13:20:14 -0000	1.6
+++ choqok.spec	9 Mar 2010 18:01:25 -0000	1.7
@@ -1,25 +1,44 @@
 Summary: Choqok KDE Micro-Blogging Client
 Name: choqok
-Version: 0.6.6
-Release: 9%{?dist}
+Version: 0.9.55
+Release: 14%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
-Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.6/choqok-0.6.6.tar.bz2
+Source: http://tejas.fedorapeople.org/choqok-0.9.55.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake >= 2.6
+BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
 
-Requires: kdeutils >= 4.1
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 A Free/Open Source micro-blogging client for K Desktop Environment.
 The name comes from an ancient Persian word, which means Sparrow!
 Choqok currently supports Twitter.com and Identi.ca services.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+# for kwallet, among other goodies
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+%description libs
+%{summary}
+
+%package devel
+Group:    Development/Libraries
+Summary:  Development files for %{name}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: kdelibs4-devel
+%description devel
+%{summary}
+
+
 %prep
 %setup -q
 
@@ -34,24 +53,63 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_sharedir}/applications/kde4/choqok.desktop
+
 %clean
 rm -rf %{buildroot}
 
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README AUTHORS changelog TODO
 %{_kde4_bindir}/choqok
-%{_kde4_appsdir}/choqok/
-%{_kde4_iconsdir}/hicolor/*/apps/choqok.png
+%{_kde4_libdir}/kde4/choqok_*.so
+%{_kde4_libdir}/kde4/kcm_choqok_*.so
 %{_kde4_iconsdir}/hicolor/*/actions/retweet.png
+%{_kde4_iconsdir}/hicolor/*/apps/*.png
 %{_kde4_sharedir}/applications/kde4/choqok.desktop
-%{_kde4_sharedir}/config.kcfg/choqok.kcfg
+%{_kde4_sharedir}/config.kcfg/*.kcfg
+%{_kde4_sharedir}/kde4/services/choqok_*.desktop
+%{_kde4_sharedir}/kde4/apps/choqok
+%{_kde4_sharedir}/kde4/apps/choqok_*/*.rc
+%{_kde4_sharedir}/kde4/servicetypes/choqok*.desktop
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_kde4_includedir}/choqok/
+%{_kde4_libdir}/lib*.so
+
 
 %changelog
+* Tue Mar 09 2010 Tejas Dinkar <tejas at gja.in> - 0.9.55-14
+- Add dependency from -libs to choqok
+* Tue Mar 09 2010 Rex Dieter <rdieter at fedoraprojecdt.org> - 0.9.55-13
+- Requires: kdebase-runtime (not kdeutils)
+* Tue Mar 09 2010 Tejas Dinkar <tejas at gja.in> - 0.9.55-12
+- choqok 1.0-beta
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.6-9
+- add icon/desktop-file scriptlets
 * Sun Aug 16 2009 Tejas Dinkar <tejas at gja.in> - 0.6.6-8
 - Added Dependency on kdeutils
 - Choqok 0.6.6 is out


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Aug 2009 13:20:14 -0000	1.5
+++ sources	9 Mar 2010 18:01:25 -0000	1.6
@@ -1 +1 @@
-712ba741b6f256ec230b36bfe574d1c0  choqok-0.6.6.tar.bz2
+29d76020c9f47dee703e0feebb0fdef4  choqok-0.9.55.tar.bz2