From fe9ebae61720d3416a278d8edf85ab9b073b4f13e4068c3b4476657aa614945f Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 18 Oct 2015 17:17:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=68 --- nemo.changes | 5 +++ nemo.spec | 108 ++++++++++++++++++++++++--------------------------- 2 files changed, 55 insertions(+), 58 deletions(-) diff --git a/nemo.changes b/nemo.changes index e2017d7..70f31c7 100644 --- a/nemo.changes +++ b/nemo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 18 08:46:06 UTC 2015 - sor.alexei@meowr.ru + +- Some cleanup. + ------------------------------------------------------------------- Mon Aug 10 10:10:25 UTC 2015 - i@marguerite.su diff --git a/nemo.spec b/nemo.spec index b703615..d767cc0 100644 --- a/nemo.spec +++ b/nemo.spec @@ -16,18 +16,21 @@ # +%define soname libnemo-extension +%define sover 1 +%define typelib typelib-1_0-Nemo-3_0 Name: nemo Version: 2.6.7 Release: 0 Summary: File browser for Cinnamon -License: GPL-2.0+ and LGPL-2.0 -Group: System/GUI/Cinnamon -Url: https://github.com/linuxmint/%{name} +License: GPL-2.0+ +Group: System/GUI/Other +Url: https://github.com/linuxmint/nemo Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM marguerite@opensuse.org OBS gcc checks -Patch1: nemo-implicit-pointer-decl.patch -# PATCH-FIX-UPSTREAM margueirte@opensuse.org fix OBS gcc checks -Patch2: nemo-2.4.0-void-return-no-return.patch +# PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks. +Patch1: %{name}-implicit-pointer-decl.patch +# PATCH-FIX-UPSTREAM nemo-2.4.0-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks. +Patch2: %{name}-2.4.0-void-return-no-return.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc @@ -53,38 +56,37 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(x11) Recommends: cinnamon-translations -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{glib2_gsettings_schema_requires} +%glib2_gsettings_schema_requires %description Nemo is the file manager for the Cinnamon desktop environment. %package devel -Summary: Development files for %{name} -Group: Development/Libraries/Other +Summary: Development files for Nemo +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: libnemo-extension1 = %{version} -Requires: typelib-1_0-Nemo-3_0 = %{version} +Requires: %{soname}%{sover} = %{version} +Requires: %{typelib} = %{version} %description devel Nemo is the file manager for the Cinnamon desktop environment. This package provides the development files for Nemo. -%package -n libnemo-extension1 +%package -n %{soname}%{sover} Summary: Nemo extension shared libraries Group: System/Libraries -%description -n libnemo-extension1 +%description -n %{soname}%{sover} Nemo is the file manager for the Cinnamon desktop environment. This package provides Nemo's shared libraries. -%package -n typelib-1_0-Nemo-3_0 -Summary: File Browser for Cinnamon - Introspection bindings +%package -n %{typelib} +Summary: File Browser for Cinnamon -- Introspection Bindings Group: System/Libraries -%description -n typelib-1_0-Nemo-3_0 +%description -n %{typelib} Nemo is the file manager for the Cinnamon desktop environment. This package provides the GObject Introspection bindings for Nemo. @@ -95,11 +97,12 @@ This package provides the GObject Introspection bindings for Nemo. %patch2 -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure --libexecdir=%{_libexecdir}/%{name} \ - --disable-static \ - --disable-update-mimedb \ - --enable-gtk-doc +NOCONFIGURE=1 gnome-autogen.sh +%configure \ + --libexecdir=%{_libexecdir}/%{name} \ + --disable-static \ + --disable-update-mimedb \ + --enable-gtk-doc make %{?_smp_mflags} %install @@ -110,69 +113,58 @@ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file %{name}-autostart %suse_update_desktop_file %{name}-autorun-software -# we need to own this directory -mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0 +# We need to own this directory. +mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0/ -%fdupes %{buildroot}%{_datadir} +%fdupes %{buildroot}%{_datadir}/ %post %icon_theme_cache_post %desktop_database_post -%{glib2_gsettings_schema_post} %mime_database_post - -%post -n libnemo-extension1 -p /sbin/ldconfig +%glib2_gsettings_schema_post %postun %icon_theme_cache_postun %desktop_database_postun -%{glib2_gsettings_schema_postun} %mime_database_postun +%glib2_gsettings_schema_postun -%postun -n libnemo-extension1 -p /sbin/ldconfig +%post -n %{soname}%{sover} -p /sbin/ldconfig + +%postun -n %{soname}%{sover} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS COPYING COPYING-DOCS COPYING.EXTENSIONS COPYING.LIB NEWS README.md THANKS -%{_bindir}/nemo -%{_bindir}/nemo-autorun-software -%{_bindir}/nemo-connect-server -%{_bindir}/nemo-open-with -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/nemo-convert-metadata -%{_datadir}/applications/nemo.desktop -%{_datadir}/applications/nemo-autostart.desktop -%{_datadir}/applications/nemo-autorun-software.desktop +%doc AUTHORS COPYING* README.md debian/changelog +%{_bindir}/%{name}* +%{_libexecdir}/%{name}/ +%{_datadir}/%{name}/ +%{_datadir}/applications/%{name}*.desktop +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/mime/packages/%{name}.xml %{_datadir}/dbus-1/services/org.Nemo.service %{_datadir}/dbus-1/services/org.nemo.freedesktop.FileManager1.service %{_datadir}/glib-2.0/schemas/org.nemo.gschema.xml -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/mime/packages/nemo.xml -%{_datadir}/nemo/ -%{_datadir}/gtksourceview-2.0/language-specs/nemo_action.lang -%{_datadir}/gtksourceview-3.0/language-specs/nemo_action.lang +%{_datadir}/gtksourceview-?.0/language-specs/%{name}_action.lang %{_datadir}/polkit-1/actions/org.nemo.root.policy -%{_mandir}/man1/nemo.1.gz -%{_mandir}/man1/nemo-connect-server.1.gz -%{_libexecdir}/nemo/nemo-extensions-list +%{_mandir}/%{name}/%{name}*%{?ext_man} -%files -n typelib-1_0-Nemo-3_0 +%files -n %{typelib} %defattr(-,root,root) %{_libdir}/girepository-1.0/Nemo-3.0.typelib -%files -n libnemo-extension1 +%files -n %{soname}%{sover} %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libnemo-extension -%dir %{_libdir}/nemo -%dir %{_libdir}/nemo/extensions-3.0 -%{_libdir}/libnemo-extension.so.1 -%{_libdir}/libnemo-extension.so.1.4.0 +%{_libdir}/%{name}/ +%{_libdir}/%{soname}.so.%{sover}* %files devel %defattr(-,root,root) -%{_includedir}/nemo/ -%{_libdir}/libnemo-extension.so -%{_libdir}/pkgconfig/libnemo-extension.pc +%{_includedir}/%{name}/ +%{_libdir}/%{soname}.so +%{_libdir}/pkgconfig/%{soname}.pc %{_datadir}/gir-1.0/Nemo-3.0.gir %changelog