rpms/gloobus-preview/F-12 gloobus-location-prereconf.patch, NONE, 1.1 gloobus-preview.spec, NONE, 1.1 sources, 1.1, 1.2
dignan
dignan at fedoraproject.org
Thu Feb 11 16:49:16 UTC 2010
Author: dignan
Update of /cvs/pkgs/rpms/gloobus-preview/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7778/F-12
Modified Files:
sources
Added Files:
gloobus-location-prereconf.patch gloobus-preview.spec
Log Message:
* Thu Feb 11 2010 Patrick Dignan <dignan.patrick at, gmail.com> 0.4.1-5
- Initial Import (#558685)
gloobus-location-prereconf.patch:
Makefile.am | 2 ++
configure.ac | 13 +++----------
data/images/Makefile.am | 2 +-
src/Makefile.am | 4 +---
src/plugin-comic/Makefile.am | 4 ++--
src/plugin-folder/Makefile.am | 4 ++--
src/plugin-gstreamer-audio/Makefile.am | 4 ++--
src/plugin-gstreamer-video/Makefile.am | 4 ++--
src/plugin-icns/Makefile.am | 4 ++--
src/plugin-openoffice/Makefile.am | 4 ++--
src/plugin-pdf/Makefile.am | 4 ++--
src/plugin-pixbuf/Makefile.am | 4 ++--
src/plugin-text/Makefile.am | 4 ++--
src/plugin-ttf/Makefile.am | 4 ++--
14 files changed, 27 insertions(+), 34 deletions(-)
--- NEW FILE gloobus-location-prereconf.patch ---
diff -Naurb gloobus-preview-0.4.1.orig/configure.ac gloobus-preview-0.4.1/configure.ac
--- gloobus-preview-0.4.1.orig/configure.ac 2009-10-30 08:45:31.000000000 -0400
+++ gloobus-preview-0.4.1/configure.ac 2010-02-07 18:12:33.463894719 -0500
@@ -1,5 +1,7 @@
AC_INIT(src/gloobus-preview-main.cpp)
+AC_CONFIG_MACRO_DIR([m4])
+
PACKAGE=gloobus-preview
VERSION=0.4.2
REPORT_ADDRESS="http://launchpad.net/gloobus"
@@ -41,17 +43,8 @@
# Checks for library functions.
AC_CHECK_FUNCS([strpbrk])
-dnl Set PACKAGE PREFIX
-if test "x${prefix}" = "xNONE"; then
- packageprefix=${ac_default_prefix}
-else
- packageprefix=${prefix}
-fi
-
-
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_PATH, "${packageprefix}/share/gloobus","Dynamic Data path")
-AC_DEFINE_UNQUOTED(PACKAGE_LIB_PATH, "${packageprefix}/lib/gloobus","Dynamic lib path")
+AC_SUBST([AM_CPPFLAGS], ["-D'PACKAGE_LIB_PATH=\"\$(libdir)/gloobus\"' -D'PACKAGE_DATA_PATH=\"\$(pkgdatadir)\"'"])
AC_CONFIG_FILES([
Makefile
diff -Naurb gloobus-preview-0.4.1.orig/data/images/Makefile.am gloobus-preview-0.4.1/data/images/Makefile.am
--- gloobus-preview-0.4.1.orig/data/images/Makefile.am 2009-10-30 08:45:31.000000000 -0400
+++ gloobus-preview-0.4.1/data/images/Makefile.am 2010-02-07 18:21:45.397770582 -0500
@@ -1,5 +1,5 @@
-bcdir = $(prefix)/share/gloobus
+bcdir = $(pkgdatadir)
dist_bc_DATA = close_button.png \
gloobus_button.png
diff -Naurb gloobus-preview-0.4.1.orig/Makefile.am gloobus-preview-0.4.1/Makefile.am
--- gloobus-preview-0.4.1.orig/Makefile.am 2009-08-29 08:19:29.000000000 -0400
+++ gloobus-preview-0.4.1/Makefile.am 2010-02-07 18:11:44.259764703 -0500
@@ -1 +1,3 @@
SUBDIRS = src data
+
+ACLOCAL_AMFLAGS = -I m4
diff -Naurb gloobus-preview-0.4.1.orig/src/Makefile.am gloobus-preview-0.4.1/src/Makefile.am
--- gloobus-preview-0.4.1.orig/src/Makefile.am 2009-09-10 08:01:00.000000000 -0400
+++ gloobus-preview-0.4.1/src/Makefile.am 2010-02-07 18:11:44.260770250 -0500
@@ -1,9 +1,7 @@
SUBDIRS = plugin-comic plugin-folder plugin-icns plugin-gstreamer-audio plugin-gstreamer-video plugin-openoffice plugin-pdf plugin-pixbuf plugin-text plugin-ttf .
-CXXFLAGS = -Wall -g #If -O2 iDocument threads don't work
-#AM_CXXFLAGS = -Wall
AM_LDFLAGS = -rdynamic
-AM_CPPFLAGS =$(CAIRO_CFLAGS) $(GTK_CFLAGS) $(LIBGNOMEUI_CFLAGS) $(PTHREAD_CFLAGS) $(GTKSOURCEVIEW_CFLAGS)
+AM_CPPFLAGS +=$(CAIRO_CFLAGS) $(GTK_CFLAGS) $(LIBGNOMEUI_CFLAGS) $(PTHREAD_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -g
AM_LDADD = $(PTHREAD_LIBS) $(CAIRO_LIBS) $(GTK_LIBS) $(LIBGNOMEUI_LIBS) $(GTKSOURCEVIEW_LIBS) -ldl
bin_PROGRAMS = gloobus-preview
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-comic/Makefile.am gloobus-preview-0.4.1/src/plugin-comic/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-comic/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-comic/Makefile.am 2010-02-07 18:11:44.260770250 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS)
plugin_LTLIBRARIES = comic.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-folder/Makefile.am gloobus-preview-0.4.1/src/plugin-folder/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-folder/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-folder/Makefile.am 2010-02-07 18:11:44.261648028 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS)
plugin_LTLIBRARIES = folder.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-gstreamer-audio/Makefile.am gloobus-preview-0.4.1/src/plugin-gstreamer-audio/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-gstreamer-audio/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-gstreamer-audio/Makefile.am 2010-02-07 18:11:44.261648028 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS) $(GSTREAMER_CFLAGS) $(GDK_CFLAGS) $(TAGLIB_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS) $(GSTREAMER_CFLAGS) $(GDK_CFLAGS) $(TAGLIB_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS) $(GSTREAMER_LIBS) $(GDK_LIBS) $(TAGLIB_LIBS)
plugin_LTLIBRARIES = audio.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-gstreamer-video/Makefile.am gloobus-preview-0.4.1/src/plugin-gstreamer-video/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-gstreamer-video/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-gstreamer-video/Makefile.am 2010-02-07 18:11:44.262770504 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS) $(GSTREAMER_CFLAGS) $(GDK_CFLAGS) $(GSTREAMER_PLUGINS_BASE_CFLAGS) $(GSTREAMER_INTERFACES_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS) $(GSTREAMER_CFLAGS) $(GDK_CFLAGS) $(GSTREAMER_PLUGINS_BASE_CFLAGS) $(GSTREAMER_INTERFACES_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS) $(GSTREAMER_LIBS) $(GDK_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) $(GSTREAMER_INTERFACES_LIBS)
plugin_LTLIBRARIES = video.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-icns/Makefile.am gloobus-preview-0.4.1/src/plugin-icns/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-icns/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-icns/Makefile.am 2010-02-07 18:11:44.262770504 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS)
plugin_LTLIBRARIES = icns.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-openoffice/Makefile.am gloobus-preview-0.4.1/src/plugin-openoffice/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-openoffice/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-openoffice/Makefile.am 2010-02-07 18:11:44.263770446 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS) $(POPPLER_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS) $(POPPLER_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS) $(POPPLER_LIBS)
plugin_LTLIBRARIES = openoffice.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-pdf/Makefile.am gloobus-preview-0.4.1/src/plugin-pdf/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-pdf/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-pdf/Makefile.am 2010-02-07 18:11:44.263770446 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS) $(POPPLER_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS) $(POPPLER_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS) $(POPPLER_LIBS)
plugin_LTLIBRARIES = pdf.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-pixbuf/Makefile.am gloobus-preview-0.4.1/src/plugin-pixbuf/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-pixbuf/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-pixbuf/Makefile.am 2010-02-07 18:11:44.264764562 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS)
plugin_LTLIBRARIES = pixbuf.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-text/Makefile.am gloobus-preview-0.4.1/src/plugin-text/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-text/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-text/Makefile.am 2010-02-07 18:11:44.264764562 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS)
plugin_LTLIBRARIES = text.la
diff -Naurb gloobus-preview-0.4.1.orig/src/plugin-ttf/Makefile.am gloobus-preview-0.4.1/src/plugin-ttf/Makefile.am
--- gloobus-preview-0.4.1.orig/src/plugin-ttf/Makefile.am 2009-09-07 10:36:23.000000000 -0400
+++ gloobus-preview-0.4.1/src/plugin-ttf/Makefile.am 2010-02-07 18:11:44.265764402 -0500
@@ -1,6 +1,6 @@
-plugindir = $(prefix)/lib/gloobus/
+plugindir = $(libdir)/gloobus/
-AM_CPPFLAGS =$(GTK_CFLAGS) $(FREETYPE_CFLAGS) $(CAIRO_CFLAGS)
+AM_CPPFLAGS +=$(GTK_CFLAGS) $(FREETYPE_CFLAGS) $(CAIRO_CFLAGS)
AM_LDFLAGS = $(GTK_LIBS) $(FREETYPE_LIBS) $(CAIRO_LIBS)
plugin_LTLIBRARIES = ttf.la
--- NEW FILE gloobus-preview.spec ---
Name: gloobus-preview
Version: 0.4.1
Release: 5%{?dist}
Summary: A Gnome extension to enable previews for any kind of file
Group: Applications/File
License: GPLv3
URL: https://launchpad.net/gloobus-preview
Source0: http://launchpad.net/gloobus/gloobus-0.4/%{version}/+download/%{name}-%{version}.tar.gz
Source1: README.fedora.tar.gz
# This patch fixes problems with autotools not respecting install directories
# it also includes the rebuild of the autotools scripts required
Patch0: gloobus-location-prereconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: gvfs-devel
BuildRequires: gstreamer-plugins-base-devel
BuildRequires: cairomm-devel
BuildRequires: taglib-devel
BuildRequires: poppler-glib-devel
BuildRequires: libgnomeui-devel
BuildRequires: unoconv
BuildRequires: gtksourceview2-devel
BuildRequires: clutter-devel
BuildRequires: desktop-file-utils
BuildRequires: libtool
BuildRequires: autoconf
Requires: GConf2
%description
Gloobus Preview allows instant access to a variety of file types without the
need to open their default applications.
%prep
%setup -q
%setup -q -D -T -a 1
%patch0 -p1
find . -name '*.cpp' -exec chmod -x {} \;
find . -name '*.h' -exec chmod -x {} \;
libtoolize
autoreconf -if
%build
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
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
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libdir}/gloobus
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
%doc README AUTHORS COPYING THANKS README.fedora
%changelog
* Mon Feb 8 2010 Patrick Dignan <dignan.patrick, at gmail.com> 0.4.1-5
- Added scriptlets for updating icon cache, and added libtool as a BR
* Mon Feb 8 2010 Patrick Dignan <dignan.patrick, at gmail.com> 0.4.1-4
- Fixed location of .desktop file
* Sun Feb 7 2010 Patrick Dignan <dignan.patrick, at gmail.com> 0.4.1-3
- Simplified removal of .la files, removed unnecessary flags
* Thu Jan 28 2010 Patrick Dignan <dignan.patrick at, gmail.com> 0.4.1-2
- Simplified chmod statement
* Fri Dec 18 2009 Patrick Dignan <dignan.patrick at, gmail.com> 0.4.1-1
- Initial package.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloobus-preview/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 11 Feb 2010 06:26:04 -0000 1.1
+++ sources 11 Feb 2010 16:49:16 -0000 1.2
@@ -0,0 +1,2 @@
+85f13ca7770d082ee0c664cb76b5e617 README.fedora.tar.gz
+bbbc32812840fb994bf5df9dc7c793c8 gloobus-preview-0.4.1.tar.gz
More information about the scm-commits
mailing list