rpms/emelfm2/devel emelfm2-0.4-hal_flags.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 emelfm2.spec, 1.27, 1.28 sources, 1.15, 1.16 e2-0.3.6-07-12-01.patch, 1.1, NONE emelfm2-makefile.config.patch, 1.7, NONE

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29867

Modified Files:
	.cvsignore emelfm2.spec sources 
Added Files:
	emelfm2-0.4-hal_flags.patch 
Removed Files:
	e2-0.3.6-07-12-01.patch emelfm2-makefile.config.patch 
Log Message:
* Wed Apr 02 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
- Update 0.4.0
- Enable HAL support
- Add emelfm2-0.4_hal_flags.patch (Thanks to Uwe Helm)
- Require bzip2 for the unpack-plugin


emelfm2-0.4-hal_flags.patch:

--- NEW FILE emelfm2-0.4-hal_flags.patch ---
--- emelfm-0.4/Makefile.org	2008-04-02 17:14:21.000000000 +0200
+++ emelfm-0.4-dev/Makefile	2008-04-02 17:06:10.000000000 +0200
@@ -204,6 +204,9 @@
 ifeq ($(WITH_THUMBS),1)
 lCFLAGS += $(shell pkg-config --cflags gimpthumb-2.0)
 endif
+ifeq ($(WITH_HAL),1)
+lCFLAGS += $(shell pkg-config --cflags dbus-glib-1 hal)
+endif
 
 lLIBS_CFLAGS += -shared -fPIC -DPIC
 #for vfs and gvfs plugin development


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Dec 2007 19:20:37 -0000	1.15
+++ .cvsignore	5 Apr 2008 21:36:30 -0000	1.16
@@ -1 +1 @@
-emelfm2-0.3.6.tar.gz
+emelfm2-0.4.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- emelfm2.spec	18 Feb 2008 23:34:23 -0000	1.27
+++ emelfm2.spec	5 Apr 2008 21:36:30 -0000	1.28
@@ -1,18 +1,20 @@
 Name:           emelfm2
-Version:        0.3.6
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
-Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
-Patch0:         emelfm2-makefile.config.patch
-Patch1:         e2-0.3.6-07-12-01.patch
+Source0:        http://emelfm2.net/rel/emelfm2-0.4.tar.gz
+Patch0:         emelfm2-0.4-hal_flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
-Requires:       findutils >= 4.2, file, grep, sed
+Requires:       findutils >= 4.2, file, grep, sed, bzip2
+# for hal we need
+BuildRequires:  hal-devel, dbus-glib-devel
+Requires:       hal
 
 %description
 emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements 
@@ -21,9 +23,8 @@
 opening an xterm.
 
 %prep
-%setup -q
-%patch1 -p0 -b .0.3.6
-%patch0 -p0 -b .orig
+%setup -qn emelfm2-0.4
+%patch0 -p1 -b .hal_flags
 
 # fix for x86_64 libs
 sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile
@@ -32,18 +33,23 @@
 sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
-# make clean is needed because of e2-0.3.6-07-12-01.patch
-make clean
 make %{?_smp_mflags} \
     OPTIMIZE="${RPM_OPT_FLAGS}" \
     CFLAGS="${RPM_OPT_FLAGS}" \
-    PREFIX="%{_prefix}" 
+    PREFIX="%{_prefix}" \
+    DOCS_VERSION=1 \
+    WITH_TRANSPARENCY=1 \
+    WITH_KERNELFAM=1 \
+    USE_LATEST=1 \
+    NEW_COMMAND=1 \
+    WITH_ACL=1 \
+    WITH_HAL=1 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
-make install_i18n PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make install DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make install_i18n DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 %find_lang %{name}
 
@@ -72,6 +78,12 @@
 
 	
 %changelog
+* Wed Apr 02 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+- Update 0.4.0
+- Enable HAL support
+- Add emelfm2-0.4_hal_flags.patch (Thanks to Uwe Helm)
+- Require bzip2 for the unpack-plugin
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.6-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Dec 2007 19:20:37 -0000	1.15
+++ sources	5 Apr 2008 21:36:30 -0000	1.16
@@ -1 +1 @@
-cc00361a117e48823bf5bd7da5d729e0  emelfm2-0.3.6.tar.gz
+0242f340b642d7de2c09ccc8963e3135  emelfm2-0.4.tar.gz


--- e2-0.3.6-07-12-01.patch DELETED ---


--- emelfm2-makefile.config.patch DELETED ---