rpms/emelfm2/F-12 .cvsignore, 1.23, 1.24 emelfm2.spec, 1.45, 1.46 sources, 1.23, 1.24 emelfm2-0.7.0-e2p_upgrade-fix.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/F-12

Modified Files:
	.cvsignore emelfm2.spec sources 
Removed Files:
	emelfm2-0.7.0-e2p_upgrade-fix.patch 
Log Message:
* Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
- Update to 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	22 Nov 2009 17:46:08 -0000	1.23
+++ .cvsignore	21 Dec 2009 13:54:52 -0000	1.24
@@ -1 +1 @@
-emelfm2-0.7.0.tar.bz2
+emelfm2.spec


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/emelfm2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- emelfm2.spec	22 Nov 2009 18:40:22 -0000	1.45
+++ emelfm2.spec	21 Dec 2009 13:54:52 -0000	1.46
@@ -1,11 +1,10 @@
 ## Rebuild options:
-# --with hal : Build with the hal support (default: without)
-#
-## To rebuild this package with hal support:
-# rpmbuild -ba emelfm2.spec --with hal
+# --with hal : Build with hal support (default: without)
+#              use bcond_without to change the default
+%bcond_with hal
 
 Name:           emelfm2
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
@@ -13,15 +12,12 @@ Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
-# sent upstream via mailing list:
-# http://www.freelists.org/post/emelfm2/emelFM2-070-released,3
-Patch0:         emelfm2-0.7.0-e2p_upgrade-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
 BuildRequires:  file-devel
 Requires:       findutils >= 4.2, grep, sed, bzip2
-%if 0%{?_with_hal:1}
+%if %{with hal}
 BuildRequires:  hal-devel, dbus-glib-devel
 Requires:       hal
 %endif
@@ -43,7 +39,6 @@ opening an xterm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 
 # fix broken icon in emelfm2.desktop
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
@@ -51,6 +46,7 @@ sed -i 's!Icon=emelfm2!Icon=%{_datadir}/
 # get more useful build logs (verify CFLAGS etc)
 sed -i 's!^\(\t\+\)@!\1!' Makefile
 
+
 %build
 make %{?_smp_mflags} \
     CFLAGS="${RPM_OPT_FLAGS}" \
@@ -73,7 +69,7 @@ make %{?_smp_mflags} \
     %if 0%{?fedora} > 11
     WITH_POLKIT=1 \
     %endif
-    %if 0%{?_with_hal:1}
+    %if %{with hal}
       WITH_HAL=1 \
     %endif
 
@@ -111,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
+- Update to 0.7.1
+
 * Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.0-1
 - Update to 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	22 Nov 2009 17:46:09 -0000	1.23
+++ sources	21 Dec 2009 13:54:52 -0000	1.24
@@ -1 +1 @@
-77899d801915da87c5be40763d345bc6  emelfm2-0.7.0.tar.bz2
+e553041ed7a8ba8871c5cc7ce2007cb2  emelfm2.spec


--- emelfm2-0.7.0-e2p_upgrade-fix.patch DELETED ---