diff --git a/.gitignore b/.gitignore index 8c739cb..5d4798d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ fotoxx-8.0.tar.gz fotoxx-8.0-mandir.patch /fotoxx-10.11.1.tar.gz +/fotoxx-11.12.2.tar.gz +/fotoxx.desktop diff --git a/fotoxx.desktop b/fotoxx.desktop index 9d5d364..205b3a8 100644 --- a/fotoxx.desktop +++ b/fotoxx.desktop @@ -1,10 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Name=fotoxx -GenericName=fotoxx -Comment=Program for editing image files from a digital camera +GenericName=Fotoxx Photo Editor +Comment=Program for edit photos and manage collections Exec=fotoxx Icon=fotoxx Terminal=false Type=Application Categories=Application;Graphics; +MimeType=image/bmp;image/gif;image/tiff;image/jpeg;image/png; diff --git a/fotoxx.spec b/fotoxx.spec index 89a9198..25cc128 100644 --- a/fotoxx.spec +++ b/fotoxx.spec @@ -1,6 +1,6 @@ Name: fotoxx -Version: 10.11.1 -Release: 9%{?dist} +Version: 11.12.2 +Release: 1%{?dist} Summary: Photo editor Group: Applications/Multimedia @@ -8,7 +8,6 @@ License: GPLv2 URL: http://kornelix.squarespace.com/%{name} Source0: http://kornelix.squarespace.com/storage/downloads/%{name}-%{version}.tar.gz Source1: %{name}.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: desktop-file-utils @@ -33,17 +32,16 @@ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; make %{?_smp_mflags} PREFIX=%{_prefix} %install -rm -rf %{buildroot} -make install manpage DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version} +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version} install -Dm 644 -p icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png + +rm %{buildroot}%{_datadir}/applications/kornelix-fotoxx.desktop desktop-file-install --vendor="" \ --mode 644 \ --remove-category="Application" \ --dir %{buildroot}%{_datadir}/applications/ \ %{SOURCE1} -%clean -rm -rf %{buildroot} %files %defattr(-,root,root,-) @@ -57,6 +55,9 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/%{name}.png %changelog +* Sun Dec 18 2011 Pavel Alexeev - 11.12.2-1 +- Update to 11.12.2 for fix bz#755715 + * Tue Dec 06 2011 Adam Jackson - 10.11.1-9 - Rebuild for new libpng diff --git a/sources b/sources index 55850c2..6c07852 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -9de6ac081b1e4f8bef51f25198cfd151 fotoxx-10.11.1.tar.gz +a49096fb4681b5ed05c3fb2e690e53b0 fotoxx-11.12.2.tar.gz +5f19ca8ef3c0b8eab1d44813ad10e7a6 fotoxx.desktop