From 8dc724d5f91934cc5ed6a719db0c490bc01cf59b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 03 2009 15:07:26 +0000 Subject: * Wed Jun 03 2009 Rex Dieter - 1.2-0.1.alpha3 - konversation-1.2-alpha3 - optimize scriptlets --- diff --git a/.cvsignore b/.cvsignore index 0e86447..96fa99b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -konversation-1.1.tar.bz2 +konversation-1.2-alpha3.tar.bz2 diff --git a/konversation-1.1-amarok2.patch b/konversation-1.1-amarok2.patch deleted file mode 100644 index 0445409..0000000 --- a/konversation-1.1-amarok2.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -up konversation-1.1/konversation/scripts/media.amarok2 konversation-1.1/konversation/scripts/media ---- konversation-1.1/konversation/scripts/media.amarok2 2008-08-06 10:56:27.000000000 -0500 -+++ konversation-1.1/konversation/scripts/media 2009-02-13 12:41:41.000000000 -0600 -@@ -244,35 +244,35 @@ class AmarokPlayer(DCOPPlayer): - return '' - return data - --#class Amarok2Player(Player): --# def __init__(self): --# Player.__init__(self, 'Amarok2', 'audio') --# self.isRunning() --# --# def getData(self): --# playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0" --# if playing and self.isRunning(): --# for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines(): --# if re.match("^title", line): --# title=self.reEncodeString(line.strip().split(None,1)[1]) --# if re.match("^artist", line): --# artist=self.reEncodeString(line.strip().split(None,1)[1]) --# if re.match("^album", line): --# album=self.reEncodeString(line.strip().split(None,1)[1]) --# return (title, artist, album) --# else: --# return '' --# --# def isRunning(self): --# qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0] --# running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M) --# if type(running) is list: --# try: --# running=running[0] --# except IndexError: --# running='' --# self.running=bool(running.strip()) --# return self.running -+class Amarok2Player(Player): -+ def __init__(self): -+ Player.__init__(self, 'Amarok2', 'audio') -+ self.isRunning() -+ -+ def getData(self): -+ playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0" -+ if playing and self.isRunning(): -+ for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines(): -+ if re.match("^title", line): -+ title=self.reEncodeString(line.strip().split(None,1)[1]) -+ if re.match("^artist", line): -+ artist=self.reEncodeString(line.strip().split(None,1)[1]) -+ if re.match("^album", line): -+ album=self.reEncodeString(line.strip().split(None,1)[1]) -+ return (title, artist, album) -+ else: -+ return '' -+ -+ def isRunning(self): -+ qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0] -+ running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M) -+ if type(running) is list: -+ try: -+ running=running[0] -+ except IndexError: -+ running='' -+ self.running=bool(running.strip()) -+ return self.running - - import socket - -@@ -432,6 +432,7 @@ DCOP_ITEMS=subprocess.Popen(['dcop'], st - - PLAYERS = [ - AmarokPlayer(), -+Amarok2Player(), - DCOPPlayer("JuK","juk","Player trackProperty Title","Player trackProperty Artist","Player trackProperty Album"), - DCOPPlayer("Noatun",'noatun',"Noatun title",playerType='audio, video'), - DCOPPlayer("Kaffeine","kaffeine","KaffeineIface title","KaffeineIface artist","KaffeineIface album",playerType='video, audio'), diff --git a/konversation.spec b/konversation.spec index 0fd040b..6d394c0 100644 --- a/konversation.spec +++ b/konversation.spec @@ -1,30 +1,21 @@ + +%define pre alpha3 + Name: konversation -Version: 1.1 -Release: 6%{?dist} +Version: 1.2 +Release: 0.1.%{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: phonon-devel %description A simple and easy to use IRC client with support for @@ -33,75 +24,80 @@ ignore list functionality; (experimental) 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 # 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 || : +/sbin/ldconfig +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 || : +/sbin/ldconfig +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 +* Wed Jun 03 2009 Rex Dieter - 1.2-0.1.alpha3 +- konversation-1.2-alpha3 +- optimize scriptlets + * Mon Mar 02 2009 Dennis gilmore - 1.1-6 - make Patch and %%patch use the same number diff --git a/sources b/sources index 153d75e..0b40cb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d38a16747ab4f6549863de385cb551c konversation-1.1.tar.bz2 +880fcf55fbd85677249e78b8ebee1252 konversation-1.2-alpha3.tar.bz2