rpms/emelfm2/F-9 .cvsignore, 1.16, 1.17 emelfm2.spec, 1.29, 1.30 sources, 1.16, 1.17 emelfm2-0.4-hal_flags.patch, 1.1, NONE

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13323/F-9

Modified Files:
	.cvsignore emelfm2.spec sources 
Removed Files:
	emelfm2-0.4-hal_flags.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-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Apr 2008 21:36:30 -0000	1.16
+++ .cvsignore	10 Jul 2008 13:12:32 -0000	1.17
@@ -1 +1 @@
-emelfm2-0.4.tar.gz
+emelfm2-0.4.1.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-9/emelfm2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- emelfm2.spec	5 Apr 2008 21:47:02 -0000	1.29
+++ emelfm2.spec	10 Jul 2008 13:12:32 -0000	1.30
@@ -1,20 +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.4.0
+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-0.4.tar.gz
-Patch0:         emelfm2-0.4-hal_flags.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, bzip2
-# for hal we need
+%if 0%{?_with_hal:1}
 BuildRequires:  hal-devel, dbus-glib-devel
-#Requires:       hal
+Requires:       hal
+%endif
 
 %description
 emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements 
@@ -22,9 +28,9 @@
 file typing scheme, and a built-in command line for executing commands without 
 opening an xterm.
 
+
 %prep
-%setup -qn emelfm2-0.4
-%patch0 -p1 -b .hal_flags
+%setup -q
 
 # fix for x86_64 libs
 sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile
@@ -32,6 +38,7 @@
 # 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 %{?_smp_mflags} \
     OPTIMIZE="${RPM_OPT_FLAGS}" \
@@ -42,8 +49,10 @@
     WITH_KERNELFAM=1 \
     USE_LATEST=1 \
     NEW_COMMAND=1 \
-    WITH_ACL=1 \
-    WITH_HAL=1 
+    %if 0%{?_with_hal:1}
+      WITH_HAL=1 \
+    %endif
+    WITH_ACL=1
 
 
 %install
@@ -60,6 +69,7 @@
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,6 +88,11 @@
 
 	
 %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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Apr 2008 21:36:30 -0000	1.16
+++ sources	10 Jul 2008 13:12:32 -0000	1.17
@@ -1 +1 @@
-0242f340b642d7de2c09ccc8963e3135  emelfm2-0.4.tar.gz
+215d0a872350b4bdb22de940a8f2a4af  emelfm2-0.4.1.tar.gz


--- emelfm2-0.4-hal_flags.patch DELETED ---