rpms/imagination/F-14 imagination-3.0-configure.in.patch, NONE, 1.1 imagination-3.0-docfix.patch, NONE, 1.1 imagination-3.0-icon_fix.patch, NONE, 1.1 imagination-3.0-plugins.patch, NONE, 1.1 imagination.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Jun 7 18:11:55 CEST 2011

Author: hobbes1069

Update of /cvs/free/rpms/imagination/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25002/F-14

Modified Files:
	.cvsignore sources 
Added Files:
	imagination-3.0-configure.in.patch 
	imagination-3.0-docfix.patch imagination-3.0-icon_fix.patch 
	imagination-3.0-plugins.patch imagination.spec 
Log Message:
Initial Import (BZ#1702)


imagination-3.0-configure.in.patch:
 configure.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE imagination-3.0-configure.in.patch ---
--- trunk/configure.in	2011/03/06 20:23:41	598
+++ trunk/configure.in	2011/04/23 06:57:35	599
@@ -19,6 +19,8 @@
 AC_PROG_LN_S
 AC_PROG_INTLTOOL
 
+AC_SEARCH_LIBS([sqrtf], [m], [], [AC_MSG_ERROR([Unable to find math library])])
+
 # for plugins
 AC_DISABLE_STATIC
 AM_PROG_LIBTOOL

imagination-3.0-docfix.patch:
 main-window.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE imagination-3.0-docfix.patch ---
--- src/main-window.c.orig	2011-04-16 16:34:10.826673407 -0500
+++ src/main-window.c	2011-04-16 16:35:18.218400982 -0500
@@ -2127,7 +2127,7 @@
 	gchar *lang = NULL;
 	
 	lang = g_strndup(g_getenv("LANG"),2);
-	file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"/html/",lang,"/index.html",NULL);
+	file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"-",PACKAGE_VERSION,"/html/",lang,"/index.html",NULL);
 	g_free(lang);
 	img_message (img, FALSE, "%s\n", file);
 
@@ -2135,7 +2135,7 @@
 	if ( !gtk_show_uri(NULL,file, GDK_CURRENT_TIME, NULL))
 	{
 		g_free( file );
-		file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"/html/en/index.html",NULL);
+		file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"-",PACKAGE_VERSION,"/html/en/index.html",NULL);
 		gtk_show_uri(NULL,file, GDK_CURRENT_TIME, NULL);
 	}
 	g_free(file);

imagination-3.0-icon_fix.patch:
 main-window.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE imagination-3.0-icon_fix.patch ---
diff -Naur imagination-3.0.orig/src/main-window.c imagination-3.0/src/main-window.c
--- imagination-3.0.orig/src/main-window.c	2011-04-18 13:08:21.379948445 -0500
+++ imagination-3.0/src/main-window.c	2011-04-18 16:24:03.886827476 -0500
@@ -262,7 +262,7 @@
 	gtk_widget_add_accelerator (import_menu,"activate",img_struct->accel_group,GDK_i,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
 	g_signal_connect (G_OBJECT (import_menu),"activate",G_CALLBACK (img_add_slides_thumbnails),img_struct);
 
-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 18, 0, NULL);
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image-x-generic", 18, 0, NULL);
 	image_menu = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_menu),image_menu);
@@ -272,7 +272,7 @@
 	gtk_widget_add_accelerator (import_audio_menu,"activate",img_struct->accel_group,GDK_m,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
 	g_signal_connect (G_OBJECT (import_audio_menu),"activate",G_CALLBACK (img_select_audio_files_to_add),img_struct);
 
-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 18, 0, NULL);
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"audio-x-generic", 18, 0, NULL);
 	image_menu = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_audio_menu),image_menu);
@@ -526,7 +526,7 @@
 	gtk_widget_show (separatortoolitem);
 	gtk_container_add (GTK_CONTAINER (toolbar),separatortoolitem);
 
-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL);
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image-x-generic", 20, 0, NULL);
 	tmp_image = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 
@@ -535,7 +535,7 @@
 	gtk_widget_set_tooltip_text(import_button, _("Import pictures"));
 	g_signal_connect ((gpointer)import_button, "clicked", G_CALLBACK (img_add_slides_thumbnails),img_struct);
 
-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 20, 0, NULL);
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"audio-x-generic", 20, 0, NULL);
 	tmp_image = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 

imagination-3.0-plugins.patch:
 support.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE imagination-3.0-plugins.patch ---
--- src/support.h.orig	2011-04-14 10:15:43.664518243 -0500
+++ src/support.h	2011-04-14 10:15:54.424101238 -0500
@@ -20,7 +20,7 @@
 #ifndef __IMAGINATION_SUPPORT_H
 #define __IMAGINATION_SUPPORT_H
 
-#define PLUGINS_INSTALLED 0
+#define PLUGINS_INSTALLED 1
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>


--- NEW FILE imagination.spec ---
Name:           imagination          
Version:        3.0
Release:        6%{?dist}
Summary:        A lightweight and simple GTK based DVD slide show creator

Group:          Applications/Multimedia
License:        GPLv2
URL:            http://imagination.sourceforge.net/
Source0:        http://downloads.sourceforge.net/project/imagination/imagination/%{version}/%{name}-%{version}.tar.gz
Patch0:         imagination-3.0-plugins.patch
Patch1:         imagination-3.0-docfix.patch
# Fix icon references to not require gnome-icon-theme-legacy
Patch2:         imagination-3.0-icon_fix.patch
# Fixed in upstream trunk
# http://imagination.svn.sourceforge.net/viewvc/imagination/trunk/configure.in?view=patch&r1=599&r2=598&pathrev=599
Patch3:         imagination-3.0-configure.in.patch

BuildRequires:  gtk2-devel
BuildRequires:  sox-devel
BuildRequires:  ffmpeg-devel
BuildRequires:  libxslt docbook-style-xsl
BuildRequires:  intltool
BuildRequires:  hicolor-icon-theme
BuildRequires:  desktop-file-utils
BuildRequires:  libtool

Requires:       ffmpeg
Requires:       hicolor-icon-theme
Requires:       gnome-icon-theme


%description
Imagination is a lightweight and simple DVD slide show maker written in C
language and built with the GTK+2 toolkit.


%prep
%setup -q
%patch0 -b .plugins
%patch1 -b .docfix
%patch2 -p1 -b .iconfix
%patch3 -p1 -b .conffix


%build
# Necessary due to patched configure.in
/bin/bash ./autogen.sh

%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Move documentation so it will go in the right directory
rm -rf $(pwd)/_tmpdoc && mkdir $(pwd)/_tmpdoc
mv -f %{buildroot}%{_docdir}/%{name}/html $(pwd)/_tmpdoc/

# Remove unnecessary library files
rm %{buildroot}%{_libdir}/%{name}/*.la

%find_lang %{name}

desktop-file-validate %{buildroot}/%{_datadir}/applications/imagination.desktop

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README _tmpdoc/*
%{_bindir}/imagination
%{_datadir}/applications/*
%{_datadir}/icons/*
%{_datadir}/%{name}
%{_libdir}/%{name}


%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 || :


%changelog
* Sun May  1 2011 Richard Shaw <hobbes1069 at gmail.com> - 3.0-6
- Fixed minor issues with spec file for packaging compliance.

* Sat Apr 23 2011 Richard Shaw <hobbes1069 at gmail.com> - 3.0-5
- Added upstream patch to fix building for Fedora 13

* Mon Apr 18 2011 Richard Shaw <hobbes1069 at gmail.com> - 3.0-4
- Patched to use new icon names instead of requiring a legacy package.

* Mon Apr 18 2011 Richard Shaw <hobbes1069 at gmail.com> - 3.0-3
- Fixed missing icons thanks to https://bugzilla.rpmfusion.org/show_bug.cgi?id=1617#c3

* Sat Apr 16 2011 Richard Shaw <hobbes1069 at gmail.com> - 3.0-2
- Updated spec file to correct documentation location.

* Thu Apr 14 2011 Richard Shaw <hobbes1069 at gmail.com> - 3.0-1
- Build for initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/imagination/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 May 2011 09:19:58 -0000	1.1
+++ .cvsignore	7 Jun 2011 16:11:55 -0000	1.2
@@ -0,0 +1 @@
+imagination-3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/imagination/F-14/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 May 2011 09:19:58 -0000	1.1
+++ sources	7 Jun 2011 16:11:55 -0000	1.2
@@ -0,0 +1 @@
+ec7e6cf234020801a2af0fa04cfefef1  imagination-3.0.tar.gz

