Author: tpg
Date: Fri Feb 9 07:46:39 2007
New Revision: 118321
Added:
packages/cooker/kflickr/current/SOURCES/kflickr-0.7.tar.bz2 (contents,
props changed)
packages/cooker/kflickr/current/SOURCES/kflickr-desktop.patch
Removed:
packages/cooker/kflickr/current/SOURCES/kflickr-0.5.tar.bz2
Modified:
packages/cooker/kflickr/current/SPECS/kflickr.spec
Log:
- new version
- fix menu entry
- fix build
- spec file clean
Added: packages/cooker/kflickr/current/SOURCES/kflickr-0.7.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/kflickr/current/SOURCES/kflickr-desktop.patch
==============================================================================
--- (empty file)
+++ packages/cooker/kflickr/current/SOURCES/kflickr-desktop.patch Fri Feb
9 07:46:39 2007
@@ -0,0 +1,8 @@
+--- src/kflickr.desktop 2006-08-22 02:11:52.000000000 +0000
++++ kflickr.desktop.tpg 2007-02-09 06:26:45.000000000 +0000
+@@ -9,4 +9,4 @@
+ Exec=kflickr
+ Icon=kflickr
+ Type=Application
+-Categories=KDE;Graphics;Photography;Network;FileTransfer;
++Categories=X-MandrivaLinux-Internet-Other;KDE;Graphics;Photography;Network;FileTransfer;
Modified: packages/cooker/kflickr/current/SPECS/kflickr.spec
==============================================================================
--- packages/cooker/kflickr/current/SPECS/kflickr.spec (original)
+++ packages/cooker/kflickr/current/SPECS/kflickr.spec Fri Feb 9 07:46:39 2007
@@ -1,97 +1,74 @@
-%define name kflickr
-%define version 0.5
-%define release %mkrel 4
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
+%define __libtoolize true
+
+Summary: Permit to easily upload photos to your Flickr.com account
+Name: kflickr
+Version: 0.7
+Release: %mkrel 1
Group: Communications
License: GPL
-Source0:
http://ovh.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
URL: http://kflickr.sourceforge.net/
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Summary: Permit to easily upload photos to your Flickr.com account
-
+Source0:
http://ovh.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+patch0: %{name}-desktop.patch
BuildRequires: kdebase-devel
-
-Requires: kdebase
-
-
+Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
%description
KFlickr is a standalone KDE application that allows
for easy upload of your favourite photos to your Flickr.com account
%prep
-%setup -q -n %{name}-%{version}
+%setup -qn %{name}-%{version}
+%patch0 -p0
%build
-export QTDIR=%_prefix/lib/qt3
-export QTLIB=$QTDIR/%_lib
-
-%configure --enable-final --disable-rpath --enable-strict
+%configure2_5x \
+ --disable-rpath \
+ --enable-pch \
+ --enable-nmcheck \
%make
%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall_std
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-install -d $RPM_BUILD_ROOT/%{_menudir}
-kdedesktop2mdkmenu.pl %{name} "Internet/Other"
$RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kflickr.desktop
$RPM_BUILD_ROOT%{_menudir}/%{name} kde
-install -m644 $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/%{name}.png -D
$RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
-install -m644 $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/%{name}.png -D
$RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
-#install -m644 $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/%{name}.png -D
$RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
-
-#Relativisation of symlink, rpm fails to do it FIXME
-#rm -f $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/%{name}/common
-#ln -sf ../common $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/%{name}/common
+%makeinstall_std
+mkdir -p %{buildroot}%{_datadir}/applications
+mv -f %{buildroot}%{_datadir}/applnk/Graphics/%{name}.desktop
%{buildroot}%{_datadir}/applications
%find_lang %{name}
%post
-%update_menus
-%if %mdkversion > 200600
+%{update_menus}
+%if %mdkversion > 200700
%update_icon_cache hicolor
%endif
%postun
-%clean_menus
-%if %mdkversion > 200600
+%{clean_menus}
+%if %mdkversion > 200700
%clean_icon_cache hicolor
%endif
-
%clean
-rm -rf $RPM_BUILD_ROOT
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
%files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(644,root,root,755)
%dir %{_docdir}/HTML/en/%{name}
%doc %{_docdir}/HTML/en/%{name}/common
%doc %{_docdir}/HTML/en/%{name}/index.cache.bz2
%doc %{_docdir}/HTML/en/%{name}/index.docbook
%doc %{_docdir}/HTML/en/%{name}/shot1.png
-
-%{_bindir}/%name
-%{_menudir}/%name
-
-%{_datadir}/applnk/Graphics/kflickr.desktop
-%{_datadir}/apps/kflickr/kflickrui.rc
-%{_datadir}/apps/kflickr/batchmode.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/add.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/down.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/edit.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/remove.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/rotate.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/up.png
-%{_datadir}/apps/kflickr/icons/hicolor/16x16/actions/viewmag.png
-
-%{_iconsdir}/%name.png
-%{_miconsdir}/%name.png
-
-%{_iconsdir}/hicolor/16x16/apps/kflickr.png
-%{_iconsdir}/hicolor/32x32/apps/kflickr.png
-
-
+%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_libdir}/kde3/lib%{name}*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/apps/kflickr/kflickrshell.rc
+%{_datadir}/apps/kflickrpart/kflickrpart.rc
+%{_datadir}/apps/kflickr/*.png
+%{_datadir}/apps/konqueror/servicemenus/%{name}*
+%{_datadir}/services/%{name}*
+%{_datadir}/apps/kflickr/icons/hicolor/*/actions/*.png
+%{_iconsdir}/hicolor/*/apps/%{name}.png
+%{_mandir}/man1/%{name}*
+
\ No newline at end of file
