rpms/xournal/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xournal-configure.in-freetype.patch, 1.1, 1.2 xournal.spec, 1.9, 1.10 x-xoj.desktop, 1.2, NONE xournal.desktop, 1.2, NONE xournal.xml, 1.1, NONE

Mon Oct 5 16:31:44 UTC 2009

Author: rvinyard

Update of /cvs/pkgs/rpms/xournal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21364

Modified Files:
	.cvsignore sources xournal-configure.in-freetype.patch 
	xournal.spec 
Removed Files:
	x-xoj.desktop xournal.desktop xournal.xml 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	7 Apr 2008 13:53:38 -0000	1.4
+++ .cvsignore	5 Oct 2009 16:31:44 -0000	1.5
@@ -1 +1 @@
-xournal-0.4.2.1.tar.gz
+xournal-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Apr 2008 13:53:38 -0000	1.4
+++ sources	5 Oct 2009 16:31:44 -0000	1.5
@@ -1 +1 @@
-b56b1403b68b60a5a27b028d91a38e88  xournal-0.4.2.1.tar.gz
+795e4396ded2b67766eb2926be1fb4a9  xournal-0.4.5.tar.gz

xournal-configure.in-freetype.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xournal-configure.in-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/xournal-configure.in-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xournal-configure.in-freetype.patch	22 Sep 2007 01:20:15 -0000	1.1
+++ xournal-configure.in-freetype.patch	5 Oct 2009 16:31:44 -0000	1.2
@@ -1,15 +1,15 @@
---- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
-+++ configure.in	2007-09-21 19:12:52.000000000 -0600
-@@ -8,11 +8,11 @@
- AC_ISC_POSIX
+--- configure.in.orig	2009-10-05 09:32:56.000000000 -0600
++++ configure.in	2009-10-05 09:34:42.000000000 -0600
+@@ -9,11 +9,11 @@
  AC_PROG_CC
  AM_PROG_CC_STDC
+ AC_PROG_RANLIB
  AC_HEADER_STDC
  
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2"
  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
  
- AC_OUTPUT([
+ GETTEXT_PACKAGE=xournal


Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/xournal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xournal.spec	26 Feb 2009 11:47:29 -0000	1.9
+++ xournal.spec	5 Oct 2009 16:31:44 -0000	1.10
@@ -1,24 +1,23 @@
 Name:		xournal
-Version:	0.4.2.1
-Release:	3%{?dist}
-Summary:	Xournal notetaking, sketching and PDF annotation
+Version:	0.4.5
+Release:	1%{?dist}
+Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
 License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Source1:	xournal.desktop
-Source2:	xournal.xml
-Source3:	x-xoj.desktop
 Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel >= 2.4.0 
+BuildRequires:	gtk2-devel >= 2.10.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	poppler-glib-devel >= 0.5.4
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
+BuildRequires:	gettext
 
 Requires:	poppler-utils
 Requires:	ghostscript
@@ -60,14 +59,15 @@ done
 %{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
 desktop-file-install --vendor fedora \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	%{SOURCE1}
+	xournal.desktop
 
 # GNOME (shared-mime-info) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
+%{__install} -p -m 0644 -D xournal.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
 
 # KDE (legacy) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%{__install} -p -m 0644 -D x-xoj.desktop ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
 
+%find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -85,7 +85,7 @@ update-desktop-database %{_datadir}/appl
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -101,6 +101,17 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Oct 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-1
+- New upstream release
+- Removed xournal.xml, xournal.desktop and x-xoj.desktop sources as they are now in upstream source
+- Updated gtk2 devel requirements to 2.10
+- Added poppler-glib-devel to BR
+- Added gettext BR
+- Updated summary
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- x-xoj.desktop DELETED ---


--- xournal.desktop DELETED ---


--- xournal.xml DELETED ---


