rpms/pcmanfm/devel .cvsignore, 1.21, 1.22 pcmanfm.spec, 1.33, 1.34 sources, 1.21, 1.22 pcmanfm-0.5-exec-from-non-terminal.patch, 1.1, NONE pcmanfm-0.5-icon-fallback.patch, 1.3, NONE pcmanfm-0.5-kill-find-immediately.patch, 1.1, NONE pcmanfm-0.5.2-DSOlinkage.patch, 1.1, NONE pcmanfm-0.5.2-remove-invalid-trailing-newline.patch, 1.1, NONE pcmanfm-0.5.2-update-translations.patch, 1.1, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Sun Mar 21 17:20:14 UTC 2010
Author: mtasaka
Update of /cvs/extras/rpms/pcmanfm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8276
Modified Files:
.cvsignore pcmanfm.spec sources
Removed Files:
pcmanfm-0.5-exec-from-non-terminal.patch
pcmanfm-0.5-icon-fallback.patch
pcmanfm-0.5-kill-find-immediately.patch
pcmanfm-0.5.2-DSOlinkage.patch
pcmanfm-0.5.2-remove-invalid-trailing-newline.patch
pcmanfm-0.5.2-update-translations.patch
Log Message:
* Mon Mar 22 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.3-1
- Update to 0.9.3
- Install %name.png for compatibility on <= F-13
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 30 Oct 2009 21:04:24 -0000 1.21
+++ .cvsignore 21 Mar 2010 17:20:12 -0000 1.22
@@ -1 +1 @@
-pcmanfm-0.5.2.tar.bz2
+pcmanfm-0.9.3.tar.gz
Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- pcmanfm.spec 13 Feb 2010 17:31:59 -0000 1.33
+++ pcmanfm.spec 21 Mar 2010 17:20:14 -0000 1.34
@@ -1,42 +1,24 @@
-%define enable_inotify 0
-%define enable_hal 1
-
Name: pcmanfm
-Version: 0.5.2
-Release: 2%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
Summary: Extremly fast and lightweight file manager
Group: User Interface/Desktops
License: GPLv2+
URL: http://pcmanfm.sourceforge.net/
-Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.bz2
-Patch0: pcmanfm-0.5-kill-find-immediately.patch
-Patch1: pcmanfm-0.5-icon-fallback.patch
-# http://pcmanfm.svn.sourceforge.net/viewvc/pcmanfm/trunk/po/ca.po?r1=902&r2=911
-# without this build will fail due to an invalid po file
-Patch2: pcmanfm-0.5.2-remove-invalid-trailing-newline.patch
-# udate translations from svn rev 918 to fix untranslated strings introduced in 0.5.2
-Patch3: pcmanfm-0.5.2-update-translations.patch
-# Sent upstream (sf bug 2313286)
-Patch10: pcmanfm-0.5-exec-from-non-terminal.patch
-# For ld --no-add-needed
-# Patch11 needs autotools
-Patch11: pcmanfm-0.5.2-DSOlinkage.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: dbus-glib-devel
-BuildRequires: gamin-devel
-BuildRequires: gtk2-devel
-BuildRequires: hal-devel >= 0.5.0
-BuildRequires: startup-notification-devel
+Source0: http://downloads.sourceforge.net/pcmanfm/PCManFM2%20+%20Libfm%20(experimental)/PCManFM/pcmanfm-0.9.3.tar.gz
+
+BuildRequires: libfm-gtk-devel
+BuildRequires: menu-cache-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
-# For Patch11
-BuildRequires: automake
-BuildRequires: libtool
+# For compatibility
+%if 0%{?fedora} <= 13
+BuildRequires: lxde-icon-theme
+%endif
%description
PCMan File Manager is an extremly fast and lightweight file manager
@@ -44,79 +26,20 @@ which features tabbed browsing and user-
%prep
%setup -q
-%patch0 -p1 -b .search_hang
-%patch2 -p1 -b .invalid
-%patch3 -p1 -b .updated
-%patch10 -p1 -b .non_terminal
-%patch11 -p1 -b .DSO
-
-%if 0%{?fedora} >= 10 && 0
-function replace_icon(){
- find . -name \*.c | xargs grep -l $1 | \
- xargs %{__sed} -i -e "s|\"$1\"|\"$2\"|"
-}
-
-replace_icon gnome-dev-cdrom gtk-cdrom
-replace_icon gnome-dev-floppy media-floppy
-replace_icon gnome-dev-disc-cdr gtk-cdrom
-replace_icon gnome-dev-disc-cdrw gtk-cdrom
-for type in \
- gnome-dev-disc-dvdrom gnome-dev-disc-dvdram \
- gnome-dev-disc-dvdrw gnome-dev-disc-dvdr-plus
- do
- replace_icon $type media-optical-dvd
-done
-replace_icon gnome-dev-harddisk drive-harddisk
-replace_icon gnome-dev-harddisk-usb drive-harddisk-usb
-replace_icon gnome-dev-harddisk-1394 drive-harddisk-ieee1394
-replace_icon gnome-dev-media-cf media-flash-cf
-replace_icon gnome-dev-media-ms media-flash-ms
-replace_icon gnome-dev-media-sm media-flash-sm
-replace_icon gnome-dev-media-sdmmc media-flash-sd
-replace_icon gnome-dev-removable drive-removable-media
-replace_icon gnome-dev-removable-1394 drive-removable-media-ieee1394
-replace_icon gnome-dev-removable-usb drive-removable-media-usb
-replace_icon gnome-fs-desktop user-desktop
-replace_icon gnome-fs-directory gtk-directory
-replace_icon gnome-fs-home user-home
-replace_icon gnome-fs-trash-empty user-trash
-#replace_icon gnome-mime- ''
-replace_icon gnome-mime-application-x-executable \
- application-x-executable
-
-%patch1 -p1 -b .icon_
-%endif
# permission fix
-%{__chmod} 0644 \
- [A-Z]*
-
-
-# For Patch11
-export NOCONFIGURE=yes
-sh autogen.sh
+chmod 0644 [A-Z]*
%build
-%configure \
-%if %{enable_hal} >= 1
- --enable-hal \
-%else
- --disable-hal \
-%endif
-%if %{enable_inotify} >= 1
- --enable-inotify
-%else
- --disable-inotify
-%endif
-
-%{__make} %{?_smp_mflags} -k
-
+%configure
+make %{?_smp_mflags} -k \
+ GMSGFMT="msgfmt --statistics"
%install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install \
+rm -rf $RPM_BUILD_ROOT
+make install \
DESTDIR=$RPM_BUILD_ROOT \
- INSTALL="%{__install} -p"
+ INSTALL="install -p"
desktop-file-install \
--delete-original \
@@ -125,38 +48,55 @@ desktop-file-install \
--vendor 'fedora' \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}*.desktop
-%find_lang %{name}
+# pcmanfm2 <-> pcmanfm2
+mv $RPM_BUILD_ROOT%{_datadir}/applications/fedora-%{name}2.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/applications/fedora-%{name}.desktop
+ln -sf %{name}2 %{buildroot}%{_bindir}/%{name}
+
+# compatibility
+%if 0%{?fedora} <= 13
+mkdir %{buildroot}%{_datadir}/pixmaps
+# No link but copy so that non-LXDE user won't require
+# LXDE stuff
+cp -p %{_datadir}/icons/nuoveXT2/128x128/apps/system-file-manager.png \
+ %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%endif
-/usr/lib/rpm/check-rpaths
+%find_lang %{name}2
+
+%{_prefix}/lib/rpm/check-rpaths
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%post
update-desktop-database &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
exit 0
%postun
update-desktop-database &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
exit 0
-%files -f %{name}.lang
+%files -f %{name}2.lang
%defattr(-,root,root,-)
%doc AUTHORS
%doc COPYING
%doc README
-%doc TODO
%{_bindir}/%{name}*
-%{_datadir}/%{name}/
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/%{name}*/
%{_datadir}/applications/fedora-%{name}*.desktop
-%{_datadir}/mime/packages/*.xml
+
+%if 0%{?fedora} <= 13
+%{_datadir}/pixmaps/%{name}.png
+%endif
%changelog
+* Mon Mar 22 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.3-1
+- Update to 0.9.3
+- Install %%name.png for compatibility on <= F-13
+
* Sun Feb 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-2
- Fix F-13 DSO linkage issue
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 30 Oct 2009 21:04:25 -0000 1.21
+++ sources 21 Mar 2010 17:20:14 -0000 1.22
@@ -1 +1 @@
-750f89cbe7496e5f4c09e4c5a95dec6e pcmanfm-0.5.2.tar.bz2
+a93ce99f2f14582b89e278aae95c7fa0 pcmanfm-0.9.3.tar.gz
--- pcmanfm-0.5-exec-from-non-terminal.patch DELETED ---
--- pcmanfm-0.5-icon-fallback.patch DELETED ---
--- pcmanfm-0.5-kill-find-immediately.patch DELETED ---
--- pcmanfm-0.5.2-DSOlinkage.patch DELETED ---
--- pcmanfm-0.5.2-remove-invalid-trailing-newline.patch DELETED ---
--- pcmanfm-0.5.2-update-translations.patch DELETED ---
More information about the scm-commits
mailing list