[rosa-launcher] Update to 2.0.0

[Joseph Marrero]

commit 9279a9579172545f415466fa0c1fd91a48ffc724
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Sun Dec 23 21:43:17 2012 -0400

    Update to 2.0.0

 appletCMakeLists_rosa-launcher-0.34.18_fix.patch   |    8 ---
 appletSrcTabbarh_rosa-launcher-0.34.18_fix.patch   |   10 ---
 ...mefGalleryAreaC_rosa-launcher-0.34.18_fix.patch |   11 ----
 rosa-launcher-0.34.18.tar.gz                       |  Bin 221219 -> 0 bytes
 rosa-launcher-2.0.0.tar.gz                         |  Bin 0 -> 560550 bytes
 rosa-launcher.spec                                 |   64 ++++----------------
 starterCMakeLists_rosa-launcher-0.34.18_fix.patch  |    8 ---
 toplevelCMakeLists_rosa-launcher-0.34.18_fix.patch |   17 -----
 8 files changed, 11 insertions(+), 107 deletions(-)
---
diff --git a/rosa-launcher-2.0.0.tar.gz b/rosa-launcher-2.0.0.tar.gz
new file mode 100644
index 0000000..b2a786c
Binary files /dev/null and b/rosa-launcher-2.0.0.tar.gz differ
diff --git a/rosa-launcher.spec b/rosa-launcher.spec
index 9895203..3fc9c10 100644
--- a/rosa-launcher.spec
+++ b/rosa-launcher.spec
@@ -1,5 +1,5 @@
 Name:           rosa-launcher
-Version:        0.34.18
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        ROSA Desktop Application Launcher
  
@@ -7,20 +7,8 @@ License:        GPLv3
 URL:            http://www.rosalab.ru/
 Source0:        http://abf.rosalinux.ru/tigro/rosa-launcher/%{name}-%{version}.tar.gz
 
-## upstreamable patches
-# fix cmake to work recursively, don't overlink
-Patch01: toplevelCMakeLists_rosa-launcher-0.34.18_fix.patch 
-# fix local-applet build
-Patch02: appletSrcTabbarh_rosa-launcher-0.34.18_fix.patch
-Patch03: appletTimefGalleryAreaC_rosa-launcher-0.34.18_fix.patch
-# install the right rosa-starter .desktop file
-Patch04: starterCMakeLists_rosa-launcher-0.34.18_fix.patch
-# install the right rosa-launcher-applet .desktop file
-Patch05:  appletCMakeLists_rosa-launcher-0.34.18_fix.patch
-
-
 BuildRequires:  kdelibs4-devel
-
+BuildRequires:  qjson-devel
 Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
  
@@ -31,44 +19,15 @@ ROSA Desktop Application Launcher
 %prep
 %setup -q
 
-%patch01 -p1 -b .toplevelCMakeLists
-%patch02 -p1 -b .appletSrcTabbarh
-%patch03 -p1 -b .appletTimefGalleryAreaC
-%patch04 -p1 -b .starterCMakeLists
-%patch05 -p1 -b .appletCMakeLists
-
-# fix permissions
-find -name \*.h -o -name \*.cpp -o -name \*.desktop | xargs chmod 644
-
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} .. 
 popd
 make %{?_smp_mflags} -C %{_target_platform}
  
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
- 
-# install locale/translations manually
-mkdir -p %{buildroot}%{_datadir}/locale
-cp -a  locale/* %{buildroot}%{_datadir}/locale/
-rm -fv  %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/*.po*
-
-%find_lang ROSA_Launcher
-
-# install icons manually
-install -p -m644 -D icons/rosalauncher.png %{buildroot}/usr/share/icons/oxygen/128x128/apps/rosalauncher.png
-install -d %{buildroot}%{_datadir}/apps/rosa-launcher/icons/buttons/
-install -p -m644 \
-  icons/buttons/* \
-  %{buildroot}%{_datadir}/apps/rosa-launcher/icons/buttons/ 
-install -p -m644 \
-  icons/rosa-icon.png \
-  %{buildroot}%{_datadir}/apps/rosa-launcher/icons/ 
-ln -s %{_kde4_iconsdir}/oxygen/256x256/places/start-here-kde-fedora.png \
-  %{buildroot}%{_datadir}/apps/rosa-launcher/icons/mandriva-icon.png
 
 %post
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -82,20 +41,19 @@ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 fi
  
-%files -f ROSA_Launcher.lang
+%files
 %{_kde4_bindir}/rosa-launcher 
-%{_kde4_iconsdir}/oxygen/*/apps/rosalauncher.*
-%{_datadir}/apps/rosa-launcher/
-%{_kde4_datadir}/kde4/services/plasma-applet-rosa-launcher.desktop
 %{_kde4_datadir}/kde4/services/plasma-applet-rosastarter.desktop
-#%{_kde4_datadir}/kde4/services/plasma-runner-rosa-services.desktop
-%{_kde4_libdir}/kde4/plasma_applet_rosa-launcher.so
+%{_kde4_datadir}/rosa-launcher/*
+%{_kde4_datadir}/timeframe/*
+%{_kde4_datadir}/locale
 %{_kde4_libdir}/kde4/plasma_applet_rosastarter.so
-#%{_kde4_libdir}/kde4/plasma_runner_rosa_services.so
-
-
+%{_kde4_libdir}/libtimeframe.so
  
 %changelog
+* Sun Dec 23 2012 Joseph Marrero <jmarrero at fedoraproject.org> 2.0.0-1
+- Update to rosa-launcher-2.0.0
+
 * Sun Aug 26 2012 Joseph Marrero <jmarrero at fedoraproject.org> 0.34.18-1
 - Update to rosa-launcher-0.34.18 and fix source.