Hello community, here is the log from the commit of package libfm for openSUSE:Factory checked in at 2013-01-02 12:58:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfm (Old) and /work/SRC/openSUSE:Factory/.libfm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libfm/libfm.changes 2012-08-24 13:52:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libfm.new/libfm.changes 2013-01-02 12:58:22.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Dec 19 08:34:50 UTC 2012 - [email protected] + +- New upstream version 1.1.0 + * detailed changelog at http://blog.lxde.org/?p=951 +- removed libfm-1.0.1-test.patch now in upstream code +- removed autoconf from BuilRequires, no more needed +- migration to gtk3 for suse > 12.2 +- added libfm-1.1.0-gtk3_doc.patch to fix doc builds with GTK3 enable +- dropped support for suse < 11.4 + +------------------------------------------------------------------- +Sun Oct 7 16:40:14 UTC 2012 - [email protected] + +- new upstream version 1.0.1 + +------------------------------------------------------------------- Old: ---- libfm-1.0.tar.gz New: ---- libfm-1.1.0-gtk3_doc.patch libfm-1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm.spec ++++++ --- /var/tmp/diff_new_pack.WmogwU/_old 2013-01-02 12:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.WmogwU/_new 2013-01-02 12:58:24.000000000 +0100 @@ -20,22 +20,29 @@ Summary: A glib/gio-based lib used to develop file managers License: GPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.0 +Version: 1.1.0 Release: 0 Url: http://www.lxde.org/ Source0: %name-%version.tar.gz Source1: %name-rpmlintrc Patch0: %name-default-config.patch +Patch1: %name-1.1.0-gtk3_doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gtk-doc +%if 0%{?suse_version} <= 1220 BuildRequires: gtk2-devel +%else +BuildRequires: gtk3-devel +%endif BuildRequires: intltool +BuildRequires: libexif-devel BuildRequires: libtool BuildRequires: menu-cache-devel >= 0.3.2 BuildRequires: update-desktop-files +BuildRequires: vala >= 0.13.0 PreReq: desktop-file-utils PreReq: shared-mime-info @@ -50,20 +57,33 @@ %description -n libfm3 libfm libraries for development +%if 0%{?suse_version} <= 1220 %package -n libfm-gtk3 -Summary: GTK libfm libraries +Summary: GTK2 libfm libraries Group: System/Libraries %description -n libfm-gtk3 GTK libfm libraries for development +%else +%package -n libfm-gtk3-3 +Summary: GTK3 libfm libraries +Group: System/Libraries + +%description -n libfm-gtk3-3 +GTK libfm libraries for development +%endif %package devel Summary: Devel files for libfm Group: Development/Libraries/C and C++ Requires: %name = %version -Requires: glib2-devel +%if 0%{?suse_version} <= 1220 Requires: gtk2-devel Requires: libfm-gtk3 = %version +%else +Requires: gtk3-devel +Requires: libfm-gtk3-3 = %version +%endif Requires: libfm3 = %version Requires: pkg-config @@ -82,10 +102,16 @@ %prep %setup -q %patch0 -p1 +%if 0%{?suse_version} > 1220 +%patch1 -p1 +%endif %build %configure \ --disable-static \ +%if 0%{?suse_version} > 1220 + --with-gtk=3 \ +%endif --enable-debug \ --enable-gtk-doc @@ -99,15 +125,11 @@ %makeinstall %__rm -f %{buildroot}%{_libdir}/*.la %__rm -f %{buildroot}/%{_libdir}/gio/modules/libgiofm.la -# these settings will have no effect without the gio extension so remove them -%if 0%{?suse_version} >= 1140 %__rm -f %{buildroot}%{_sysconfdir}/xdg/%name/pref-apps.conf %__rm -f %{buildroot}%{_bindir}/libfm-pref-apps %__rm -f %{buildroot}%{_datadir}/applications/libfm-pref-apps.desktop %__rm -f %{buildroot}%{_mandir}/man1/libfm-pref-apps.1 -%else -%suse_update_desktop_file libfm-pref-apps -%endif + %find_lang %{name} %fdupes -s %{buildroot}/%{_datadir}/locale @@ -119,9 +141,15 @@ /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : /usr/bin/update-desktop-database +%if 0%{?suse_version} <= 1220 %post -n libfm-gtk3 -p /sbin/ldconfig %postun -n libfm-gtk3 -p /sbin/ldconfig +%else +%post -n libfm-gtk3-3 -p /sbin/ldconfig + +%postun -n libfm-gtk3-3 -p /sbin/ldconfig +%endif %post -n libfm3 -p /sbin/ldconfig @@ -132,23 +160,20 @@ %dir %{_sysconfdir}/xdg/%name %config %{_sysconfdir}/xdg/%name/%name.conf %{_datadir}/mime/packages/%name.xml -%if 0%{?suse_version} < 1140 -%config %{_sysconfdir}/xdg/%name/pref-apps.conf -%{_bindir}/libfm-pref-apps -%{_datadir}/applications/libfm-pref-apps.desktop -%{_mandir}/man1/libfm-pref-apps.1.gz -%endif %files -n libfm3 %defattr(-,root,root) %{_libdir}/libfm.so.* -%if 0%{?suse_version} < 1140 -%{_libdir}/gio/modules/libgiofm.so -%endif +%if 0%{?suse_version} <= 1220 %files -n libfm-gtk3 %defattr(-,root,root) %{_libdir}/libfm-gtk.so.* +%else +%files -n libfm-gtk3-3 +%defattr(-,root,root) +%{_libdir}/libfm-gtk3.so.* +%endif %dir %{_datadir}/%name %dir %{_datadir}/%name/ui %_datadir/%name/archivers.list @@ -157,11 +182,16 @@ %files devel %defattr(-,root,root) %dir %{_includedir}/%name -%dir %{_includedir}/%name/%name -%{_includedir}/%name/%name/*.h +%dir %{_includedir}/%name-1.0 +%{_includedir}/%name-1.0/*.h %{_libdir}/pkgconfig/%name.pc %{_libdir}/pkgconfig/%name-gtk.pc +%{_libdir}/pkgconfig/%name-gtk3.pc +%if 0%{?suse_version} <= 1220 %{_libdir}/libfm-gtk.so +%else +%{_libdir}/libfm-gtk3.so +%endif %{_libdir}/libfm.so %files doc ++++++ libfm-1.1.0-gtk3_doc.patch ++++++ diff -uNr old-libfm-1.1.0/docs/reference/libfm/Makefile.am libfm-1.1.0/docs/reference/libfm/Makefile.am --- old-libfm-1.1.0/docs/reference/libfm/Makefile.am 2012-09-19 15:31:43.000000000 +0200 +++ libfm-1.1.0/docs/reference/libfm/Makefile.am 2012-12-19 09:57:40.470843971 +0100 @@ -120,7 +120,7 @@ $(GTK_CFLAGS) GTKDOC_LIBS= \ $(top_builddir)/src/libfm.la \ - $(top_builddir)/src/libfm-gtk.la \ + $(top_builddir)/src/libfm-gtk3.la \ $(GTK_LIBS) \ $(NULL) diff -uNr old-libfm-1.1.0/docs/reference/libfm/Makefile.in libfm-1.1.0/docs/reference/libfm/Makefile.in --- old-libfm-1.1.0/docs/reference/libfm/Makefile.in 2012-10-31 20:34:46.000000000 +0100 +++ libfm-1.1.0/docs/reference/libfm/Makefile.in 2012-12-19 09:57:48.822666419 +0100 @@ -372,7 +372,7 @@ GTKDOC_LIBS = \ $(top_builddir)/src/libfm.la \ - $(top_builddir)/src/libfm-gtk.la \ + $(top_builddir)/src/libfm-gtk3.la \ $(GTK_LIBS) \ $(NULL) ++++++ libfm-1.0.tar.gz -> libfm-1.1.0.tar.gz ++++++ ++++ 109097 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
