1.1.1

.gitignore

@@ -12,3 +12,4 @@ libfm-0.1.12.tar.gz
 /libfm-1.0.tar.gz
 /libfm-1.0.1.tar.gz
 /libfm-1.1.0.tar.gz
+/libfm-1.1.1.tar.gz

libfm-pref-apps.desktop

@@ -0,0 +1,55 @@
+[Desktop Entry]
+Type=Application
+Name=Preferred Applications
+Name[ar]=التطبيقات المفضّلة
+Name[be]=Пераважныя праграмы
+Name[bg]=Предпочитани програми
+Name[bn]=পছন্দনীয় অ্যাপ্লিকেশন
+Name[ca]=Aplicacions preferides
+Name[cs]=Preferované aplikace
+Name[da]=Foretrukne programmer
+Name[de]=Bevorzugte Anwendungen
+Name[el]=Προτιμώμενες εφαρμογές
+Name[en_GB]=Preferred Applications
+Name[es]=Aplicaciones preferidas
+Name[et]=Eelistatud rakendused
+Name[eu]=Hobetsitako aplikazioak
+Name[fa]=نرم‌افزارهای برگزیده
+Name[fi]=Oletussovellukset
+Name[fo]=Framumtiknar nýtsluskipanir
+Name[fr]=Applications favorites
+Name[gl]=Aplicativos preferidos
+Name[he]=יישומים מועדפים
+Name[hr]=Željeni programi
+Name[hu]=Alapértelmezett alkalmazások
+Name[id]=Aplikasi Pilihan
+Name[it]=Applicazioni preferite
+Name[ja]=既定のアプリケーション
+Name[kk]=Таңдамалы қолданбалар
+Name[ko]=기본 프로그램
+Name[lg]=Puloguramu ennondemu
+Name[lt]=Pageidaujamos programos
+Name[nl]=Voorkeurstoepassingen
+Name[pl]=Preferowane programy
+Name[pt]=Aplicações preferidas
+Name[pt_BR]=Aplicativos Preferidos
+Name[ro]=Programe preferate
+Name[ru]=Предпочтительные приложения
+Name[sk]=Odporúčané aplikácie
+Name[sl]=Prednostni programi
+Name[sr]=Подразумевани програми
+Name[sr@latin]=Podrazumevani programi
+Name[sv]=Program
+Name[te]=ప్రాధాన్య అనువర్తనాలు
+Name[tr]=Tercih Edilen Uygulamalar
+Name[tt_RU]=Яратылган кушымталар
+Name[ug]=ئامراق پروگراممىلار
+Name[uk]=Улюблені програми
+Name[vi]=Ứng dụng ưa thích
+Name[zh_CN]=优先使用的应用程序
+Name[zh_TW]=偏好的應用程式
+Icon=preferences-desktop
+Exec=libfm-pref-apps
+StartupNotify=true
+Categories=Settings;DesktopSettings;X-LXDE-Settings;GTK;
+NotShowIn=GNOME;XFCE;KDE;

libfm.spec

@@ -4,12 +4,7 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
 %global         usegit      0
-%global         mainrel     2
-
-%global         usegtk3     0
-%if 0%{?fedora} >= 18
-%global         usegtk3     1
-%endif
+%global         mainrel     1
 
 %global         githash     d22b41fd2f738164c2cc89f6ae5d08c8bea6c65c
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
@@ -25,8 +20,8 @@
 %global         build_doc   1
 
 Name:           libfm
-Version:        1.1.0
-Release:        %{fedorarel}%{?dist}.2
+Version:        1.1.1
+Release:        %{fedorarel}%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -37,25 +32,19 @@ Source0:        %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
 %else
 Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 %endif
+# Use 1.1.0 desktop file as many language entry disappeared
+Source1:        libfm-pref-apps.desktop
 # Fedora specific patches
 Patch0:         libfm-0.1.9-pref-apps.patch
 
 BuildRequires:  libexif-devel
-%if %{usegtk3}
 BuildRequires:  gtk3-devel
-%else
-BuildRequires:  gtk2-devel >= 2.16.0
-%endif
 BuildRequires:  menu-cache-devel >= 0.3.2
 
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 
-# Patch1
-BuildRequires:	automake
-BuildRequires:	libtool
-
 BuildRequires:	gtk-doc
 BuildRequires: libxslt
 
@@ -131,12 +120,7 @@ This package containg development documentation files for %{name}.
 %setup -q
 %patch0 -p1 -b .orig
 
-%if %{usegtk3}
-sed -i.gtk3 \
-   -e 's|libfm-gtk.la|libfm-gtk3.la|' \
-   docs/reference/libfm/Makefile.am
-%endif
-autoreconf -fi
+install -cpm 644 %{SOURCE1} data/
 
 # ???
 #mkdir m4 || :
@@ -150,12 +134,8 @@ sed -i.libdir_syssearch \
 %build
 %configure \
     --enable-gtk-doc \
-%if 0%{?fedora} >= 18
     --enable-udisks \
-%endif
-%if %{usegtk3}
     --with-gtk=3 \
-%endif
     --disable-static
 # To show translation status
 make -C po -j1 GMSGFMT="msgfmt --statistics"
@@ -165,11 +145,7 @@ make %{?_smp_mflags} -k
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
-%if %{usegtk3}
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libfm-gtk.pc
-%else
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libfm-gtk3.pc
-%endif
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
@@ -233,11 +209,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %defattr(-,root,root,-)
 %{_mandir}/man1/libfm-pref-apps.1.*
 %{_bindir}/libfm-pref-apps
-%if %{usegtk3}
 %{_libdir}/%{name}-gtk3.so.3*
-%else
-%{_libdir}/%{name}-gtk.so.3*
-%endif
 #%%dir %%{_libdir}/libfm/
 #%%{_libdir}/libfm/gnome-terminal
 %{_datadir}/libfm/
@@ -256,13 +228,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %files gtk-devel -f gtk-header.files
 %defattr(-,root,root,-)
 %{_includedir}/libfm-1.0/fm-gtk.h
-%if %{usegtk3}
 %{_libdir}/%{name}-gtk3.so
 %{_libdir}/pkgconfig/libfm-gtk3.pc
-%else
-%{_libdir}/%{name}-gtk.so
-%{_libdir}/pkgconfig/libfm-gtk.pc
-%endif
 
 %if 0%{?build_doc}
 %files devel-docs
@@ -273,6 +240,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 %changelog
+* Thu Aug  8 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.1.1-1
+- 1.1.1
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-a5bc8b8291cf810c659bfb3af378b5de  libfm-1.1.0.tar.gz
+90ba664616b06835db7ebc949388d03b  libfm-1.1.1.tar.gz