diff --git a/.cvsignore b/.cvsignore index 3e2ce05..78e6b1d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xournal-0.4.2.1.tar.gz +xournal-0.4.5.tar.gz diff --git a/sources b/sources index 5d7567a..07bf3e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b56b1403b68b60a5a27b028d91a38e88 xournal-0.4.2.1.tar.gz +795e4396ded2b67766eb2926be1fb4a9 xournal-0.4.5.tar.gz diff --git a/x-xoj.desktop b/x-xoj.desktop deleted file mode 100644 index c9c36e5..0000000 --- a/x-xoj.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=MimeType -MimeType=application/x-xoj -Icon=application-x-xoj -Patterns=*.xoj;*.XOJ;*.Xoj; -Comment=Xournal note file -Comment[fr]=Fichier Xournal -[Property::X-KDE-pdf] -Type=bool -Value=true diff --git a/xournal-configure.in-freetype.patch b/xournal-configure.in-freetype.patch index 6cd3fb4..3d6f339 100644 --- a/xournal-configure.in-freetype.patch +++ b/xournal-configure.in-freetype.patch @@ -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 diff --git a/xournal.desktop b/xournal.desktop deleted file mode 100644 index 4db595e..0000000 --- a/xournal.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application - -Name=Xournal -Comment=Take notes, sketch and annotate PDFs -Name[fr]=Xournal -Comment[fr]=Prise de notes manuscrites - -Exec=xournal %f -Terminal=false -StartupNotify=true -MimeType=application/x-xoj;application/pdf;application/x-pdf -Icon=xournal -Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor; diff --git a/xournal.spec b/xournal.spec index 2e6230b..5b4460d 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,24 +1,23 @@ Name: xournal -Version: 0.4.2.1 -Release: 4%{?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}/applications > /dev/null 2>&1 || : %{__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,14 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Mon Oct 05 2009 Rick L Vinyard Jr 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 - 0.4.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/xournal.xml b/xournal.xml deleted file mode 100644 index 6886549..0000000 --- a/xournal.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Xournal Notes - - -