Browse Source

updated: desktop-file-utils, pkgconfig

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1813 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 14 years ago
parent
commit
b883f7ae2c
2 changed files with 32 additions and 9 deletions
  1. 10 4
      d/desktop-file-utils/desktop-file-utils-vl.spec
  2. 22 5
      p/pkgconfig/pkgconfig-vl.spec

+ 10 - 4
d/desktop-file-utils/desktop-file-utils-vl.spec

@@ -1,12 +1,14 @@
+Name: desktop-file-utils
 Summary: Utilities for manipulating .desktop files
 Summary(ja): .desktop ファイルを操作するユーティリティ
-Name: desktop-file-utils
-Version: 0.16
+Version: 0.17
 Release: 1%{?_dist_release}
+
+Group: Development/Tools
+License: GPLv2
 URL: http://http://www.freedesktop.org/wiki/Software/desktop-file-utils
+
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.bz2
-License: GPLv2
-Group: Development/Tools
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= 2.4
@@ -44,8 +46,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
 %{_datadir}/emacs/site-lisp/*
+%{_mandir}/man1/*
 
 %changelog
+* Thu Sep 16 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.17-1
+- new upstream release
+
 * Tue May  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.16-1
 - new upstream release
 - removed BR: popt-devel

+ 22 - 5
p/pkgconfig/pkgconfig-vl.spec

@@ -3,13 +3,17 @@
 Summary: A tool for determining compilation options.
 Summary(ja): コンパイルオプションを決定するためのツール
 Name: pkgconfig
-Version: 0.23
-Release: 5%{?_dist_release}
+Version: 0.25
+Release: 1%{?_dist_release}
 Epoch: 1
-License: GPL
+
 Group: Development/Tools
+License: GPLv2
 Source: http://pkgconfig.freedesktop.org/releases/pkg-config-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: glib2-devel
+BuildRequires: popt-devel
 
 %description
 The pkgconfig tool determines compilation options. For each required
@@ -25,6 +29,7 @@ pkgconfigは、コンパイルオプションを決定するツールです。
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: A tool for determining compilation options.
+Summary(ja): コンパイルオプションを決定するためのツール
 Group: Development/Tools
 
 %description -n compat32-%{name}
@@ -37,15 +42,22 @@ compiler and linker flags.
 %setup -q -n pkg-config-%{version}
 
 %build
-%configure
+%configure \
+    --with-installed-glib \
+    --with-installed-popt
+
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
 #strip $RPM_BUILD_ROOT%{_bindir}/*
 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/pkg-config
+
 %if %{build_compat32}
 %__cp -a %{buildroot}%{_bindir}/pkg-config %{buildroot}%{_bindir}/pkg-config-32
 %endif
@@ -55,9 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README pkg-config-guide.html
 %{_bindir}/pkg-config
 %dir %{_libdir}/pkgconfig
+%dir %{_datadir}/pkgconfig
 %{_datadir}/aclocal/*.m4
 %{_mandir}/*/*
 
@@ -70,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 16 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:0.25-1
+- new upstream release
+- added BR: glib2-devel, popt-devel to build with installed libraries
+
 * Mon Jul 06 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1:0.23-5
 - rebuild to fix the package built with broken environment.