rpms/emelfm2/FC-5 .cvsignore, 1.9, 1.10 emelfm2-makefile.config.patch, 1.2, 1.3 emelfm2.spec, 1.13, 1.14 sources, 1.9, 1.10
Christoph Wickert (cwickert)
fedora-extras-commits at redhat.com
Sun Dec 17 19:20:14 UTC 2006
Author: cwickert
Update of /cvs/extras/rpms/emelfm2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1648
Modified Files:
.cvsignore emelfm2-makefile.config.patch emelfm2.spec sources
Log Message:
update to 0.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 8 Sep 2006 20:28:54 -0000 1.9
+++ .cvsignore 17 Dec 2006 19:19:43 -0000 1.10
@@ -1 +1 @@
-emelfm2-0.2.tar.gz
+emelfm2-0.3.1.tar.gz
emelfm2-makefile.config.patch:
Index: emelfm2-makefile.config.patch
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-5/emelfm2-makefile.config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emelfm2-makefile.config.patch 6 Aug 2006 22:28:09 -0000 1.2
+++ emelfm2-makefile.config.patch 17 Dec 2006 19:19:43 -0000 1.3
@@ -1,25 +1,20 @@
---- Makefile.config.orig 2006-06-17 16:45:01.000000000 +0200
-+++ Makefile.config 2006-08-06 23:55:05.000000000 +0200
-@@ -2,11 +2,11 @@
- ### installation (where) ###
- ############################
-
--PREFIX ?= /usr/local
-+PREFIX ?= %PREFIX%
- BIN_DIR ?= $(PREFIX)/bin
-
+--- Makefile.config.orig 2006-11-25 02:06:37.000000000 +0100
++++ Makefile.config 2006-11-11 22:30:33.000000000 +0100
+@@ -12,7 +12,7 @@
+ ### documentation ###
+ #####################
# setting this to 1 makes the default docs dir include the current version no.
-DOCS_VERSION ?= 0
+DOCS_VERSION ?= 1
- #defaults for PLUGINS_DIR, DOC_DIR, ICON_DIR, LOCALE_DIR are set in Makefile
+ #the name of the default main-user-guide document
+ HELPDOC ?= USAGE
+@@ -87,7 +87,7 @@
-@@ -63,7 +63,7 @@
-
- # setting this to 1 includes code (not much) that is applicable
- # only to Gtk versions > 2.4
+ # setting this to 1 includes code (not much) that is applicable only
+ # to Gtk versions > 2.6, if the build-system has any such Gtk
-USE_LATEST ?= 0
+USE_LATEST ?= 1
- #########################
- ### documentation ###
+ # setting DEBUG to 0/1 turns debugging off/on
+ DEBUG ?= 0
Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-5/emelfm2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emelfm2.spec 8 Sep 2006 20:28:54 -0000 1.13
+++ emelfm2.spec 17 Dec 2006 19:19:43 -0000 1.14
@@ -1,16 +1,17 @@
Name: emelfm2
-Version: 0.2.0
+Version: 0.3.1
Release: 1%{?dist}
Summary: A file manager that implements the popular two-pane design
Group: Applications/File
License: GPL
URL: http://emelfm2.net/
-Source0: http://emelfm2.net/rel/emelfm2-0.2.tar.gz
-Patch0: emelfm2-makefile.config.patch
+Source0: http://emelfm2.net/rel/emelfm2-0.3.1.tar.gz
+Patch0: emelfm2-makefile.config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.6.0, gettext, desktop-file-utils
+#BuildRequires: gamin-devel
Requires: findutils >= 4.2, file, grep, sed
%description
@@ -20,16 +21,23 @@
opening an xterm.
%prep
-%setup -qn emelfm2-0.2
+%setup -q
%patch0 -p0 -b .orig
-sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
+
# fix for x86_64 libs
sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
+
# 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}
+#echo $RPM_OPT_FLAGS
+#export CFLAGS="${RPM_OPT_FLAGS}"
+#echo $CFLAGS
+make %{?_smp_mflags} \
+ OPTIMIZE="${RPM_OPT_FLAGS}" \
+ CFLAGS="${RPM_OPT_FLAGS}" \
+ PREFIX="%{_prefix}"
%install
@@ -41,10 +49,10 @@
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
- --add-category Application \
- --add-category Utility \
- --delete-original \
+ --add-category Application \
+ --add-category System \
+ --add-category Utility \
+ --delete-original \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%clean
@@ -53,11 +61,11 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING
+%doc docs/ACTIONS docs/CONFIGURATION docs/CREDITS docs/HACKING
%doc docs/README docs/TODO docs/USAGE docs/WARNING
%doc docs/help.txt docs/GPL docs/LGPL
%{_bindir}/%{name}
-%{_libdir}/%{name}
+%{_libdir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/application-registry/%{name}.applications
%{_datadir}/pixmaps/%{name}
@@ -65,8 +73,15 @@
%changelog
+* Sat Dec 16 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-1
+- Update 0.3.1.
+- Remove Category "X-Fedora" from emelfm2.desktop.
+
+* Mon Aug 28 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+- Update 0.3.
+
* Mon Aug 28 2006 Christoph Wickert <fedora christoph-wickert de> - 0.2.0-1
-- Update 0.2.0
+- Update 0.2.0.
* Fri Aug 11 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.8-2
- Include upstream's e2-0.1.8-06-08-09.patch to fix two serious bugs.
@@ -91,7 +106,7 @@
- Update to 0.1.4.
* Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-2
-- Removed nonexistant ROADMAP from %doc.
+- Removed nonexistant ROADMAP from %%doc.
* Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-1
- Update to 0.1.3.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 8 Sep 2006 20:28:54 -0000 1.9
+++ sources 17 Dec 2006 19:19:43 -0000 1.10
@@ -1 +1 @@
-506f6a12779c23e589a55c778b648798 emelfm2-0.2.tar.gz
+c246141755a3c89137f307ce56c3c456 emelfm2-0.3.1.tar.gz
More information about the fedora-extras-commits
mailing list