rpms/emelfm2/F-8 .cvsignore, 1.15, 1.16 emelfm2.spec, 1.25, 1.26 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/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13323/F-8

Modified Files:
	.cvsignore emelfm2.spec sources 
Removed Files:
	e2-0.3.6-07-12-01.patch emelfm2-makefile.config.patch 
Log Message:
* Tue Jul 08 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
- Update 0.4.1
- Revove hal_flags.patch (fixed upstream)
- Remove HAL support until it really works. To enable rebuild "--with hal"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Dec 2007 20:34:34 -0000	1.15
+++ .cvsignore	10 Jul 2008 13:12:06 -0000	1.16
@@ -1 +1 @@
-emelfm2-0.3.6.tar.gz
+emelfm2-0.4.1.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-8/emelfm2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- emelfm2.spec	2 Dec 2007 20:34:34 -0000	1.25
+++ emelfm2.spec	10 Jul 2008 13:12:06 -0000	1.26
@@ -1,18 +1,26 @@
+## Rebuild options:
+# --with hal : Build with the hal support (default: without)
+#
+## To rebuild this package with hal support:
+# rpmbuild -ba emelfm2.spec --with hal
+
 Name:           emelfm2
-Version:        0.3.6
+Version:        0.4.1
 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/%{name}-%{version}.tar.gz
 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
+%if 0%{?_with_hal:1}
+BuildRequires:  hal-devel, dbus-glib-devel
+Requires:       hal
+%endif
 
 %description
 emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements 
@@ -20,10 +28,9 @@
 file typing scheme, and a built-in command line for executing commands without 
 opening an xterm.
 
+
 %prep
 %setup -q
-%patch1 -p0 -b .0.3.6
-%patch0 -p0 -b .orig
 
 # fix for x86_64 libs
 sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile
@@ -31,19 +38,27 @@
 # fix broken icon in emelfm2.desktop
 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 \
+    %if 0%{?_with_hal:1}
+      WITH_HAL=1 \
+    %endif
+    WITH_ACL=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}
 
@@ -54,6 +69,7 @@
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,6 +88,20 @@
 
 	
 %changelog
+* Tue Jul 08 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
+- Update 0.4.1
+- Revove hal_flags.patch (fixed upstream)
+- Remove HAL support until it really works. To enable rebuild "--with hal"
+
+* Wed Apr 02 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+- Update 0.4.0
+- Enable HAL support, but dont install hal by default
+- 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
+
 * Sun Dec 02 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-1
 - Update 0.3.6 with upstream's e2-0.3.6-07-12-01.patch
 - Enable the ACL plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Dec 2007 20:34:34 -0000	1.15
+++ sources	10 Jul 2008 13:12:06 -0000	1.16
@@ -1 +1 @@
-cc00361a117e48823bf5bd7da5d729e0  emelfm2-0.3.6.tar.gz
+215d0a872350b4bdb22de940a8f2a4af  emelfm2-0.4.1.tar.gz


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


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