rpms/konversation/F-11 .cvsignore, 1.7, 1.8 konversation.spec, 1.25, 1.26 sources, 1.7, 1.8 konversation-1.1-amarok2.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore konversation.spec sources 
Removed Files:
	konversation-1.1-amarok2.patch 
Log Message:
sync w/devel for konv-1.2 goodness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Aug 2008 14:20:05 -0000	1.7
+++ .cvsignore	11 Aug 2009 16:25:13 -0000	1.8
@@ -1 +1 @@
-konversation-1.1.tar.bz2
+konversation-1.2-alpha6.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- konversation.spec	2 Mar 2009 19:13:17 -0000	1.25
+++ konversation.spec	11 Aug 2009 16:25:13 -0000	1.26
@@ -1,107 +1,116 @@
+
+%define pre alpha6
+
 Name:           konversation
-Version:        1.1
-Release:        6%{?dist}
+Version:        1.2
+Release:        0.5.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            http://konversation.kde.org
-Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
+URL:            http://konversation.kde.org/
+Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream patches
-Patch1: konversation-1.1-amarok2.patch
-
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-%if 0%{?fedora} > 8 
-BuildRequires:  kdelibs3-devel
-%define vendor_path kde
-%else
-BuildRequires:  kdelibs-devel
-BuildRequires:  libutempter-devel
-%define vendor_pre fedora
-%define vendor_prefix -%{vendor_pre} 
-%endif
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdepimlibs-devel
+BuildRequires:  phonon-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
+Requires: kdelibs4 >= %{kde4_version}
 
 %description
 A simple and easy to use IRC client with support for
 strikeout; multi-channel joins; away / unaway messages;
-ignore list functionality; (experimental) support for foreign
+ignore list functionality; support for foreign
 language characters; auto-connect to server; optional timestamps
 to chat windows; configurable background colors and much more
 
-%prep
-%setup -q -n %{name}-%{version}
 
-%patch1 -p1 -b .amarok2
+%prep
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-final
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-desktop-file-install \
---dir="$RPM_BUILD_ROOT%{_datadir}/applications/%{?vendor_path}" \
---vendor="%{?vendor_pre}" \
---delete-original \
-$RPM_BUILD_ROOT%{_datadir}/applications/kde/konversation.desktop
 
 ## File lists
 # locale's
-%find_lang %{name} || touch %{name}.lang
+%find_lang %{name}
 # HTML
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
    lang=$(basename $lang_dir)
-   echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
+   echo "%lang($lang) %doc ${HTML_DIR}/${lang}/*" >> %{name}.lang
 done
 fi
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/konversation.desktop
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files  -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO 
-%{_bindir}/konversation
-%{_datadir}/applications/%{?vendor_path}/%{?vendor_prefix}konversation.desktop
-%{_datadir}/apps/kconf_update/*
-%{_datadir}/apps/konversation
-%{_datadir}/config.kcfg/konversation.kcfg
-%{_datadir}/icons/crystalsvg/*/actions/*
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/services/konvirc.protocol
-%{_datadir}/services/konvirc6.protocol
+%{_kde4_bindir}/konversation
+%{_kde4_datadir}/applications/kde4/konversation.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_appsdir}/konversation/
+%{_kde4_appsdir}/kconf_update/konversation*
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.5.alpha6
+- add min kdelibs4 version
+
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.4.alpha6
+- konversation-1.2-alpha6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.3.alpha4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.2.alpha4
+- konversation-1.2-alpha4
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.1.alpha3
+- konversation-1.2-alpha3
+- optimize scriptlets
+
 * Mon Mar 02 2009 Dennis gilmore <dennis at ausil.us> - 1.1-6
 - make Patch and %%patch use the same number
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Aug 2008 14:20:05 -0000	1.7
+++ sources	11 Aug 2009 16:25:13 -0000	1.8
@@ -1 +1 @@
-0d38a16747ab4f6549863de385cb551c  konversation-1.1.tar.bz2
+1720cc7d03cfb808c666f8df9006573e  konversation-1.2-alpha6.tar.bz2


--- konversation-1.1-amarok2.patch DELETED ---