Author: neoclust
Date: Sat Feb 3 14:21:28 2007
New Revision: 116073
Added:
packages/cooker/karchiver/current/SOURCES/karchiver-3.4.2.b4.tar.bz2
(contents, props changed)
Removed:
packages/cooker/karchiver/current/SOURCES/karchiver-3.0.10.tar.bz2
packages/cooker/karchiver/current/SOURCES/karchiver-3.1-fix-compile-gcc-3.4.patch.bz2
Modified:
packages/cooker/karchiver/current/SPECS/karchiver.spec
Log:
- New version 3.4.2
Added: packages/cooker/karchiver/current/SOURCES/karchiver-3.4.2.b4.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/karchiver/current/SPECS/karchiver.spec
==============================================================================
--- packages/cooker/karchiver/current/SPECS/karchiver.spec (original)
+++ packages/cooker/karchiver/current/SPECS/karchiver.spec Sat Feb 3
14:21:28 2007
@@ -1,6 +1,6 @@
%define name karchiver
-%define version 3.0.10
-%define release %mkrel 5
+%define version 3.4.2
+%define release %mkrel 1
%define major 2
%define libname %mklibname %name %major
@@ -13,21 +13,14 @@
License: GPL
Group: Archiving/Compression
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.b4.tar.bz2
Source1: karchiver-karchiverservicemenu.desktop
-Patch1: karchiver-3.1-fix-compile-gcc-3.4.patch.bz2
-
URL: http://perso.wanadoo.fr/coquelle/karchiver/
Buildroot: %{_tmppath}/%{name}-buildroot
-BuildRequires: readline-devel
-BuildRequires: pam-devel
-BuildRequires: popt-devel
-BuildRequires: libtermcap-devel
-BuildRequires: Mesa-common-devel
-BuildRequires: XFree86-static-libs
-BuildRequires: libbzip2-devel
-BuildRequires: kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs-devel
+BuildRequires: desktop-file-utils
%description
This KDE application allows you reading, extracting, converting and modifying
@@ -58,8 +51,7 @@
%prep
-%setup -q
-%patch1 -p1 -b .fix_compile_gcc_3.4
+%setup -q -n %{name}-%{version}.b4
%build
rm -rf autom4te.cache/
@@ -80,16 +72,13 @@
# David - 2.0.5-3mdk - Use a non broken .desktop
install -m 0644 %SOURCE1
%buildroot/%_datadir/apps/konqueror/servicemenus/karchiverservicemenu.desktop
-install -d -m 0755 %buildroot/%_menudir/
-cat > %buildroot/%_menudir/%name <<EOF
-?package(%{name}): \
-command="/usr/bin/karchiver" \
-title="Karchiver" \
-icon="%{name}.png" \
-longtitle="Managing archive files" \
-needs="x11" \
-section="Applications/Archiving/Compression"
-EOF
+desktop-file-install --vendor="" \
+ --remove-category="Application" \
+ --add-category="KDE" \
+ --add-category="Qt" \
+ --add-category="Archiving" \
+ --add-category="X-MandrivaLinux-System-Archiving-Compression" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde
$RPM_BUILD_ROOT%{_datadir}/applications/kde/*
# Icons
cd %buildroot
@@ -98,13 +87,6 @@
ln ./%{_datadir}/icons/hicolor/32x32/apps/karchiver.png ./%{_iconsdir}
ln ./%{_datadir}/icons/locolor/16x16/apps/karchiver.png ./%{_miconsdir}
-rm
%{buildroot}/%{_datadir}/applnk-mdk/Applications/Archiving/Compression/karchiver.desktop
-
-%post
-%{update_menus}
-
-%postun
-%{clean_menus}
%post -n %{libname} -p /sbin/ldconfig
@@ -117,66 +99,45 @@
%defattr (-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
%_bindir/*
-#
-#%_datadir/icons/hicolor/22x22/actions/*.png
-#%_datadir/icons/hicolor/32x32/actions/*.png
+%_datadir/applications/kde/karchiver.desktop
+%_datadir/apps/karchiver/KArchiverSfxModule.jar
+%_datadir/apps/karchiver/SevenzSfxModule.sfx
+%_datadir/services/karchiver_part.desktop
%_datadir/icons/hicolor/32x32/apps/*.png
%_datadir/icons/hicolor/32x32/mimetypes/*.png
-#
%_datadir/icons/hicolor/48x48/apps/*.png
-#
-#%_datadir/icons/locolor/16x16/actions/*.png
%_datadir/icons/locolor/16x16/apps/*.png
%_datadir/icons/locolor/16x16/mimetypes/*.png
-#
%_datadir/icons/locolor/22x22/mimetypes/*.png
-#
%_datadir/icons/locolor/32x32/apps/*.png
-#
-%_datadir/applnk/Utilities/karchiver.desktop
-#
%dir %_datadir/apps/karchiver/
%dir %_datadir/apps/karchiver/pics
%_datadir/apps/karchiver/tip.database
%_datadir/apps/karchiver/*.rc
%_datadir/apps/karchiver/pics/*.png
-#
%dir %_datadir/apps/karchiver/icons
%dir %_datadir/apps/karchiver/icons/hicolor/
%dir %_datadir/apps/karchiver/icons/hicolor/16x16/
%dir %_datadir/apps/karchiver/icons/hicolor/16x16/actions/
%_datadir/apps/karchiver/icons/hicolor/16x16/actions/*.png
-#
%dir %_datadir/apps/karchiver/icons/hicolor/22x22/
%dir %_datadir/apps/karchiver/icons/hicolor/22x22/actions/
%_datadir/apps/karchiver/icons/hicolor/22x22/actions/*.png
-#
%dir %_datadir/apps/karchiver/icons/hicolor/32x32/
%dir %_datadir/apps/karchiver/icons/hicolor/32x32/actions/
%_datadir/apps/karchiver/icons/hicolor/32x32/actions/*.png
-#
%dir %_datadir/apps/karchiver/icons/locolor/
%dir %_datadir/apps/karchiver/icons/locolor/16x16/
%dir %_datadir/apps/karchiver/icons/locolor/16x16/actions/
%_datadir/apps/karchiver/icons/locolor/16x16/actions/*.png
-#
%dir %_datadir/apps/karchiver/icons/locolor/22x22/
%dir %_datadir/apps/karchiver/icons/locolor/22x22/actions/
%_datadir/apps/karchiver/icons/locolor/22x22/actions/*.png
-#
%dir %_datadir/apps/karchiver/icons/locolor/32x32/
%dir %_datadir/apps/karchiver/icons/locolor/32x32/actions/
%_datadir/apps/karchiver/icons/locolor/32x32/actions/*.png
-#
%doc %_datadir/doc/HTML/en/karchiver
-#
-#
-%_menudir/*
-#
-#
%_datadir/apps/konqueror/servicemenus/*.desktop
-#
-#
%_liconsdir/karchiver.png
%_iconsdir/karchiver.png
%_miconsdir/karchiver.png
