home:Lazy_Kent:branches:openSUSE:Factory:Contrib/emelfm2 -> 
openSUSE:Factory:Contrib/emelfm2

   https://build.opensuse.org/request/diff/78429

   Description: Update to 0.8.0 and more.

changes files:
--------------
--- emelfm2.changes
+++ emelfm2.changes
@@ -1,0 +2,18 @@
+Thu Aug  4 23:47:20 UTC 2011 - [email protected]
+
+- Update to 0.8.0.
+- Split off lang package.
+- Use optflags.
+- Compile with ACL.
+- Compile with udisks.
+- Compile with thumbs.
+- Patch to use unrar instead of rar to unpack rar-archives.
+- Install more docs.
+- Install hicolor icons.
+- Use icon_theme_cache_post/un macro.
+- Use full URL for source.
+- Correct Summary.
+- Correct License tag.
+- Spec clean up and formatting.
+
+-------------------------------------------------------------------

old:
----
  emelfm2-0.7.1.tar.bz2

new:
----
  emelfm2-0.8.0-unrar.patch
  emelfm2-0.8.0.tar.bz2

spec files:
-----------
--- emelfm2.spec
+++ emelfm2.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package osmo (Version 0.7.1)
+# spec file for package emelfm2
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,52 +13,111 @@
 # published by the Open Source Initiative.
 #
 
-# norootforbuild
-
-
 Name:           emelfm2
-BuildRequires:  gcc
+Version:        0.8.0
+Release:        0
+License:        GPL-3.0
+Summary:        Twin-panel File Manager
+Url:            http://emelfm2.net/
+Group:          Productivity/File utilities
+Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
+#PATCH-FIX-OPENSUSE emelfm2-0.8.0-unrar.patch [email protected] -- use 
unrar instead of rar to unpack rar-archives
+Patch0:         emelfm2-0.8.0-unrar.patch
+BuildRequires:  fdupes
 BuildRequires:  file-devel
-BuildRequires:  gtk2-devel >= 2.6
+BuildRequires:  libacl-devel
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gimpthumb-2.0)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(udisks)
 BuildRequires:  update-desktop-files
-Requires:       gtk2 >= 2.6
 Requires:       file
-Summary:        File manager based on Norton Commander
-Url:            http://emelfm2.net/
-License:        GPL v3
-Group:          Productivity/File utilities
-Version:        0.7.1
-Release:        0
-Source0:        %{name}-%{version}.tar.bz2
+Requires:       udisks
+Recommends:     %{name}-lang = %{version}
+Recommends:     p7zip
+Recommends:     rar
+Recommends:     unrar
+Recommends:     unzip
+Recommends:     xz
+Recommends:     zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-It is a file manager for UNIX-like operating systems. It uses a simple and 
efficient interface pioneered by Norton Commander, in the 1980s. The main 
window is divided into three parts, described as "panes" or "panels". Two of 
those (side-by-side or top-to-bottom) show the contents of selected filesystem 
directories. The third pane, at the bottom of the window, shows the output of 
commands executed within the program. Those panes can be resized, and any one 
or two of them can be hidden and unhidden, on request. A built-in command-line, 
toolbar buttons or assigned keys can be used to initiate commands.
+emelFM2 is a file manager for UNIX-like operating systems. It uses
+a simple and efficient interface pioneered by Norton Commander, in
+the 1980s. The main window is divided into three parts, described as
+"panes" or "panels". Two of those (side-by-side or top-to-bottom) show
+the contents of selected filesystem directories. The third pane, at
+the bottom of the window, shows the output of commands executed within
+the program. Those panes can be resized, and any one or two of them can
+be hidden and unhidden, on request. A built-in command-line, toolbar
+buttons or assigned keys can be used to initiate commands.
 
+%lang_package
 
 %prep
 %setup -q 
+%patch0
 
 %build
-make %{?jobs:-j%jobs} WITH_TRANSPARENCY=1 WITH_KERNELFAM=1 WITH_CUSTOMMOUSE=1 
USE_LATEST=1 NEW_COMMAND=1 PREFIX=%{_prefix}
+make %{?_smp_mflags} \
+    CFLAGS="%{optflags}" \
+    STRIP=0 \
+    DOC_DIR=%{_defaultdocdir}/%{name} \
+    ICON_DIR=%{_datadir}/%{name}/icons \
+    LOCALE_DIR=%{_datadir}/locale \
+    PLUGINS_DIR=%{_libdir}/%{name}/plugins \
+    DOCS_VERSION=0 \
+    NEW_COMMAND=1 \
+    WITH_ACL=1 \
+    WITH_CUSTOMMOUSE=1 \
+    WITH_KERNELFAM=1 \
+    WITH_LATEST=1 \
+    WITH_THUMBS=1 \
+    WITH_TRANSPARENCY=1 \
+    WITH_UDISKS=1
 
 %install
-make install PREFIX=${RPM_BUILD_ROOT}/%{_prefix} 
LIB_DIR=${RPM_BUILD_ROOT}/%{_libdir}
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/emelfm2
-strip ${RPM_BUILD_ROOT}/%{_libdir}/emelfm2/*/*
-%suse_update_desktop_file emelfm2
+make install \
+    DOC_DIR=%{buildroot}%{_defaultdocdir}/%{name} \
+    ICON_DIR=%{buildroot}/%{_datadir}/%{name}/icons \
+    LIB_DIR=%{buildroot}/%{_libdir} \
+    LOCALE_DIR=%{buildroot}/%{_datadir}/locale \
+    PLUGINS_DIR=%{buildroot}/%{_libdir}/%{name}/plugins \
+    PREFIX=%{buildroot}%{_prefix}
+make install_i18n \
+    PREFIX=%{buildroot}%{_prefix}
+rm -rf %{buildroot}%{_datadir}/application-registry
+install -Dm 0644 icons/emelfm2_24.png \
+    %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+install -Dm 0644 icons/emelfm2_32.png \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -Dm 0644 icons/emelfm2_48.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%suse_update_desktop_file -r %{name} GTK System FileManager
+%fdupes -s %{buildroot}%{_datadir}
+%find_lang %{name}
+
+%if 0%{?suse_version} >= 1140
+%post
+%icon_theme_cache_post
+
+%postun
+%icon_theme_cache_postun
+%endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-%doc INSTALL README WARNING
-%doc %{_mandir}/man1/*
-%{_datadir}/pixmaps/*
-%dir %{_datadir}/application-registry
-%{_datadir}/application-registry/*
-%{_datadir}/applications/*
-%{_bindir}/emelfm2
-%dir %{_libdir}/emelfm2
-%{_libdir}/emelfm2/*
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/*/%{name}.png
+%doc %{_defaultdocdir}/%{name}
+%{_libdir}/%{name}
+%doc %{_mandir}/man?/*
+
+%files lang -f %{name}.lang
+%defattr(-,root,root,-)

other changes:
--------------

++++++ emelfm2-0.8.0-unrar.patch (new)
--- emelfm2-0.8.0-unrar.patch
+++ emelfm2-0.8.0-unrar.patch
@@ -0,0 +1,15 @@
+Description: Use unrar instead of rar to unpack rar-archives.
+Author: Kyrill Detinov <[email protected]>
+Index: plugins/e2p_unpack.c
+===================================================================
+--- plugins/e2p_unpack.c.orig
++++ plugins/e2p_unpack.c
+@@ -588,7 +588,7 @@ decompress ANSI:    7za x archive.zip -o
+ decompress UNICODE: 7za x archive.7z -odirname -aoa
+ */
+               "7za x %s -aoa", //or ??
+-              "rar x -o+ %s", //rar will only extract to current dir
++              "unrar x -o+ %s", //rar will only extract to current dir
+               "arj x -y %s", //or "arj x -y "UNPACKPATH" "UNPACKPATH, //NOTE 
swapped order of archive & path
+               "zoo xO %s"     //zoo will only extract to current dir
+       };

++++++ emelfm2-0.7.1.tar.bz2 -> emelfm2-0.8.0.tar.bz2
(73064 lines skipped)


To REVIEW against the previous version:
   osc request show --diff 78429

To ACCEPT the request:
   osc request accept 78429 --message="reviewed ok."
   
To DECLINE the request:
   osc request decline 78429 --message="declined for reason xyz (see ... for 
background / policy / ...)."

To REVOKE the request:
   osc request revoke 78429 --message="retracted because ..., sorry / thx / see 
better version ..."

-- 
Hermes messaging (http://hermes.opensuse.org)
openSUSE Build Service (https://build.opensuse.org/)
Collaboration: http://en.opensuse.org/Build_Service/Collaboration

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to