rpms/libpeas/devel 0001-Install-peas-demo-plugins-in-the-right-location.patch, NONE, 1.1 import.log, NONE, 1.1 libpeas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Jun 23 14:45:17 UTC 2010

Author: hadess

Update of /cvs/pkgs/rpms/libpeas/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27924/devel

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Install-peas-demo-plugins-in-the-right-location.patch 
	import.log libpeas.spec 
Log Message:
First commit


0001-Install-peas-demo-plugins-in-the-right-location.patch:
 helloworld/Makefile.am  |    2 +-
 pythonhello/Makefile.am |    2 +-
 seedhello/Makefile.am   |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Install-peas-demo-plugins-in-the-right-location.patch ---
>From 3111185550c82feca0d92b112ef825d07446c011 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Jun 2010 17:13:16 +0100
Subject: [PATCH] Install peas-demo plugins in the right location

use $(libdir) and not $(prefix)/lib for the plugins.
---
 peas-demo/plugins/helloworld/Makefile.am  |    2 +-
 peas-demo/plugins/pythonhello/Makefile.am |    2 +-
 peas-demo/plugins/seedhello/Makefile.am   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/peas-demo/plugins/helloworld/Makefile.am b/peas-demo/plugins/helloworld/Makefile.am
index 7f44913..5140f90 100644
--- a/peas-demo/plugins/helloworld/Makefile.am
+++ b/peas-demo/plugins/helloworld/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(prefix)/lib/peas-demo/plugins/helloworld
+plugindir = $(libdir)/peas-demo/plugins/helloworld
 
 INCLUDES = \
 	-I$(top_srcdir) 	\
diff --git a/peas-demo/plugins/pythonhello/Makefile.am b/peas-demo/plugins/pythonhello/Makefile.am
index 244eead..ba08e5e 100644
--- a/peas-demo/plugins/pythonhello/Makefile.am
+++ b/peas-demo/plugins/pythonhello/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(prefix)/lib/peas-demo/plugins/pythonhello
+plugindir = $(libdir)/peas-demo/plugins/pythonhello
 
 plugin_PYTHON = \
 	pythonhello.py
diff --git a/peas-demo/plugins/seedhello/Makefile.am b/peas-demo/plugins/seedhello/Makefile.am
index 4166558..640b84c 100644
--- a/peas-demo/plugins/seedhello/Makefile.am
+++ b/peas-demo/plugins/seedhello/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(prefix)/lib/peas-demo/plugins/seedhello
+plugindir = $(libdir)/peas-demo/plugins/seedhello
 
 plugin_DATA = \
 	seedhello.js			\
-- 
1.7.0.1



--- NEW FILE import.log ---
libpeas-0_5_0-3_fc13:HEAD:libpeas-0.5.0-3.fc13.src.rpm:1277304273


--- NEW FILE libpeas.spec ---
Name:		libpeas
Version:	0.5.0
Release:	3%{?dist}
Summary:	Plug-ins implementation convenience library

Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/
Source0:	http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
# https://bugzilla.gnome.org/show_bug.cgi?id=621563
Patch0:		0001-Install-peas-demo-plugins-in-the-right-location.patch
BuildRequires:	autoconf automake libtool intltool gettext-devel gnome-common

BuildRequires:	gtk3-devel
BuildRequires:	pygobject2-devel
BuildRequires:	python-devel

# For the girepository-1.0 directory
Requires:	gobject-introspection

%description
libpeas is a convenience library making adding plug-ins support
to GTK+ and glib-based applications.

%package devel
Summary:	Development files for libpeas
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	gtk-doc
Requires:	gobject-introspection-devel

%description devel
This package contains development libraries and header files
that are needed to write applications that use libpeas.

%prep
%setup -q
%patch0 -p1 -b .libdir
autoreconf -f

%build
%configure

# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}

%install
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT/%{_libdir}/lib*.la	\
	$RPM_BUILD_ROOT/%{_libdir}/libpeas-1.0/loaders/lib*.la

%find_lang libpeas

%post -p /sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :

%postun
/sbin/ldconfig
if [ $1 -eq 0 ]; then
  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :

%files -f libpeas.lang
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/libpeas*-1.0.so.*
%dir %{_libdir}/libpeas-1.0/
%dir %{_libdir}/libpeas-1.0/loaders
%{_libdir}/libpeas-1.0/loaders/libcloader.so
%{_libdir}/libpeas-1.0/loaders/libpythonloader.so
%{_libdir}/girepository-1.0/*.typelib
%{_datadir}/icons/hicolor/*/actions/libpeas-plugin.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/peas-demo
%{_includedir}/libpeas-1.0/
%{_libdir}/peas-demo/
%{_datadir}/gtk-doc/html/libpeas/
%{_libdir}/libpeas*-1.0.so
%{_datadir}/gir-1.0/*.gir
%{_libdir}/pkgconfig/*.pc

%changelog
* Fri Jun 18 2010 Bastien Nocera <bnocera at redhat.com> 0.5.0-3
- Fix a number of comments from review request

* Mon Jun 14 2010 Bastien Nocera <bnocera at redhat.com> 0.5.0-2
- Call ldconfig when installing the package

* Mon Jun 14 2010 Bastien Nocera <bnocera at redhat.com> 0.5.0-1
- First package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpeas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jun 2010 01:58:24 -0000	1.1
+++ .cvsignore	23 Jun 2010 14:45:16 -0000	1.2
@@ -0,0 +1 @@
+libpeas-0.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpeas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jun 2010 01:58:24 -0000	1.1
+++ sources	23 Jun 2010 14:45:17 -0000	1.2
@@ -0,0 +1 @@
+4e42d9b1b1137081905d4fac0a198c66  libpeas-0.5.0.tar.bz2

