Browse Source

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

kudoh 11 years ago
parent
commit
ae5d8bf8b6
4 changed files with 36 additions and 13 deletions
  1. 23 10
      lib/libf/libfm/libfm-vl.spec
  2. 4 1
      o/optipng/optipng-vl.spec
  3. 4 1
      p/pcmanfm/pcmanfm-vl.spec
  4. 5 1
      x/xnoise/xnoise-vl.spec

+ 23 - 10
lib/libf/libfm/libfm-vl.spec

@@ -1,7 +1,7 @@
 Name: libfm
 Summary: A glib/gio-based lib used to develop file managers
 Summary(ja): ファイルマネージャー開発に用いられる glib/gio ベースのライブラリー
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -34,6 +34,7 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Packager: kudoh
 
+
 %description
 A glib/gio-based lib used to develop file managers providing some
 file management utilities and related-widgets missing in gtk+/glib.
@@ -88,8 +89,6 @@ This package containg development documentation files for %{name}.
 %prep
 %setup -qn libfm-%{version}
 %patch0 -p1
-autoreconf --force --install
-intltoolize --force
 
 # treak rpath
 sed -i.libdir_syssearch -e \
@@ -97,7 +96,7 @@ sed -i.libdir_syssearch -e \
   configure
 
 %build
-%configure --enable-static=no --enable-udisks
+%configure --enable-static=no --enable-udisks --enable-gtk-doc
 make -C po -j1 GMSGFMT="msgfmt --statistics"
 make %{?_smp_mflags}
 
@@ -107,8 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libfm-gtk3.pc
 
 %find_lang %{name}
 
@@ -135,9 +133,18 @@ done
 
 /usr/lib/rpm/check-rpaths
 
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
+
 %clean
 rm -fr %{buildroot}
 
+%pre devel
+# Directory -> symlink
+if [ -d %{_includedir}/libfm ] ; then
+  rm -rf %{_includedir}/libfm
+fi
+
 %post
 /sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -174,18 +181,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %defattr(-,root,root,-)
 %doc TODO
 %dir %{_includedir}/libfm/
-%dir %{_includedir}/libfm/libfm/
-%{_includedir}/libfm/libfm/fm.h
-%{_includedir}/libfm/libfm/fm-actions.h
+#%dir %{_includedir}/libfm-1.0/
+%{_includedir}/libfm-1.0/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/libfm.pc
 
 
 %files gtk-devel -f gtk-header.files
 %defattr(-,root,root,-)
-%{_includedir}/libfm/libfm/fm-gtk.h
 %{_libdir}/%{name}-gtk.so
 %{_libdir}/pkgconfig/libfm-gtk.pc
+#%{_libdir}/pkgconfig/libfm-gtk3.pc
 
 
 %files devel-docs
@@ -195,6 +201,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sat Nov 10 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.1.0-1
+- new upstream release
+- recreated patch0
+- stopped autoreconf --force --install and intltoolize --force
+- added %%configure option --enable-gtk-doc
+- runnning desktop-file-validate in %%check
+
 * Sat Sep 22 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0.1-1
 - new upstream release
 - run autoreconf --force --install and intltoolize --force

+ 4 - 1
o/optipng/optipng-vl.spec

@@ -1,5 +1,5 @@
 Name:          optipng
-Version:       0.7.3
+Version:       0.7.4
 Release:       1%{?_dist_release}
 Summary:       PNG optimizer and converter
 Summary(ja):   PNG オプティマイザ と コンバータ
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 10 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.7.4-1
+- new upstream release
+
 * Sat Sep 22 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.7.3-1
 - new upstream release
 

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

@@ -1,5 +1,5 @@
 Name:          pcmanfm
-Version:       1.0.1
+Version:       1.1.0
 Release:       1%{?_dist_release}
 Summary:	Extremly fast and lightweight file manager
 Summary(ja):	とても高速で軽量なファイルマネージャー
@@ -91,6 +91,9 @@ update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Nov 09 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.1.0-1
+- new upstream release
+
 * Sat Sep 22 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0.1-1
 - new upstream release
 - deleted unrecognized option: --disable-static 

+ 5 - 1
x/xnoise/xnoise-vl.spec

@@ -1,7 +1,7 @@
 %define XNOISE_BIN %{_libexecdir}/%{name}
 
 Name: xnoise
-Version: 0.2.12
+Version: 0.2.13
 Release: 1%{?_dist_release}
 Summary: Tracklist-centric Media Player
 Summary(ja): トラックリストを中心とするメディアプレーヤー
@@ -131,6 +131,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Nov 10 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.13-1
+- new upstream release
+- updated Source1
+
 * Thu Oct 04 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.12-1
 - new upstream release
 - updated Source1