Browse Source

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6716 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 11 years ago
parent
commit
75decf9bc8
2 changed files with 21 additions and 10 deletions
  1. 14 6
      lib/libf/libfm/libfm-vl.spec
  2. 7 4
      p/pcmanfm/pcmanfm-vl.spec

+ 14 - 6
lib/libf/libfm/libfm-vl.spec

@@ -2,28 +2,29 @@ Name: libfm
 Summary: A glib/gio-based lib used to develop file managers
 Summary(ja): ファイルマネージャー開発に用いられる glib/gio ベースのライブラリー
 Version: 1.0
-Release: 1.rc1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/pcmanfm/
-Source0: %{name}-%{version}rc1.tar.gz
+Source0: %{name}-%{version}.tar.gz
 Patch0: libfm_customize.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf automake
+BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: fdupes
 BuildRequires: gettext
 BuildRequires: gvfs-devel
 BuildRequires: gtk-doc
 BuildRequires: gtk2-devel >= 2.16.0
-BuildRequires: glib2-devel >= 2.24.0
+BuildRequires: glib2-devel >= 2.26.0
 BuildRequires: intltool >= 0.40
 BuildRequires: menu-cache-devel >= 0.3.2
 BuildRequires: pango-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
-BuildRequires: udisks
+BuildRequires: udisks-devel
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -84,7 +85,7 @@ Group:          Development/Libraries
 This package containg development documentation files for %{name}.
 
 %prep
-%setup -qn libfm-1.0rc1
+%setup -qn libfm-1.0
 %patch0 -p1
 
 # treak rpath
@@ -93,7 +94,7 @@ sed -i.libdir_syssearch -e \
   configure
 
 %build
-%configure --enable-static=no
+%configure --enable-static=no --enable-udisks
 make -C po -j1 GMSGFMT="msgfmt --statistics"
 make %{?_smp_mflags}
 
@@ -191,6 +192,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Aug 14 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0-2
+- new upstream release
+- added BuildRequires: dbus-glib-devel
+- changed BuildRequires: glib2-devel >= 2.24.0 to 2.26.0
+- fixed BuildRequires: udisks to udisks-devel
+- added %%configure option --enable-udisks (experimental)
+
 * Tue Jul 10 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0rc1-1
 - new upstream release
 

+ 7 - 4
p/pcmanfm/pcmanfm-vl.spec

@@ -1,13 +1,13 @@
 Name:          pcmanfm
 Version:       1.0
-Release:       1.rc1%{?_dist_release}
+Release:       2%{?_dist_release}
 Summary:	Extremly fast and lightweight file manager
 Summary(ja):	とても高速で軽量なファイルマネージャー
 
 Group:          Applications/System
 License:	GPLv2+
 URL:            http://pcmanfm.sourceforge.net
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/pcmanfm/pcmanfm-%{version}rc1.tar.gz
+Source0:        http://osdn.dl.sourceforge.net/sourceforge/pcmanfm/pcmanfm-%{version}.tar.gz
 Patch0:         fix_dso_link.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -40,7 +40,7 @@ PCMan File Manager はタブブラウズとユーザーフレンドリーな
 インターフェイスを特色とするとても高速で軽量なファイルマネージャーです。
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 
 # permission fix
@@ -49,7 +49,7 @@ sed -i 's/MimeType=x-directory\/normal;inode\/directory/MimeType=inode\/director
     data/pcmanfm.desktop
 
 %build
-%configure --sysconfdir=/etc --enable-static=no
+%configure --sysconfdir=/etc --disable-static
 %{__make} %{?_smp_mflag}
 
 %install
@@ -91,6 +91,9 @@ update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Tue Aug 14 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0-2
+- new upstream release
+
 * Tue Jul 10 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0-1.rc1
 - new upstream release
 - changed BuildRequires: libfm-gtk-devel >= 0.1.15 to 0.1.99