rpms/xournal/devel x-xoj.desktop, NONE, 1.1 xournal.desktop, NONE, 1.1 xournal.spec, NONE, 1.1 xournal.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri Jun 1 20:01:48 UTC 2007

Author: rvinyard

Update of /cvs/extras/rpms/xournal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2535/devel

Modified Files:
	.cvsignore sources 
Added Files:
	x-xoj.desktop xournal.desktop xournal.spec xournal.xml 
Log Message:

--- NEW FILE x-xoj.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=MimeType
MimeType=application/x-xoj
Icon=application-x-xoj
Patterns=*.xoj;*.XOJ;
Comment=Xournal Notes
[Property::X-KDE-pdf]
Type=bool
Value=true


--- NEW FILE xournal.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Xournal
GenericName=Xournal Notetaking
Comment=Take notes, sketch and annotate PDFs
Exec=xournal %f
Icon=xournal
Terminal=false
Type=Application
StartupNotify=true
MimeType=application/x-xoj;application/pdf;application/x-pdf
Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


--- NEW FILE xournal.spec ---
Name:		xournal
Version:	0.3.3
Release:	4%{?dist}
Summary:	Xournal notetaking, sketching and PDF annotation

Group:		Applications/Editors
License:	GPL
URL:		http://xournal.sourceforge.net/
Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
Source1:	xournal.desktop
Source2:	xournal.xml
Source3:	x-xoj.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel >= 2.4.0 
BuildRequires:	libgnomecanvas-devel >= 2.4.0 
BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
BuildRequires:	desktop-file-utils
BuildRequires:	ImageMagick

%description
Xournal is an application for notetaking, sketching, keeping a journal and 
annotating PDFs. Xournal aims to provide superior graphical quality (subpixel 
resolution) and overall functionality.

%prep
%setup -q


%build
NOCONFIGURE=1 ./autogen.sh
CFLAGS="%optflags -DPACKAGE_LOCALE_DIR=\\\"\"%{_datadir}/locale\"\\\" -DPACKAGE_DATA_DIR=\\\"\"%{_datadir}\"\\\"" %configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"

# xournal icons and mime icons
# create 16x16, 32x32, 64x64, 128x128 icons and copy the 48x48 icon
for s in 16 32 48 64 128 ; do
	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/
	convert -scale ${s}x${s} \
		pixmaps/%{name}.png \
		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
	%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${s}x${s}/mimetypes
	pushd ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${s}x${s}/mimetypes
	%{__ln_s} ../apps/xournal.png application-x-xoj.png
	%{__ln_s} application-x-xoj.png gnome-mime-application-x-xoj.png
	popd
done

# Desktop entry
%{__install} -p -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
desktop-file-install --vendor fedora \
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
	%{SOURCE1}

# GNOME (shared-mime-info) MIME type registration
%{__install} -p -m 0644 -D %{SOURCE2} ${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


%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/xournal
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%{_datadir}/icons/hicolor/*x*/mimetypes/application-x-xoj.png
%{_datadir}/icons/hicolor/*x*/mimetypes/gnome-mime-application-x-xoj.png
%{_datadir}/pixmaps/xournal.png
%{_datadir}/applications/fedora-xournal.desktop
%{_datadir}/mime/packages/xournal.xml
%{_datadir}/mimelnk/application/x-xoj.desktop
%{_datadir}/xournal/
%doc AUTHORS ChangeLog COPYING



%changelog
* Wed May 30 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-4
- Added optflags and PACKAGE_DATA_DIR to CFLAGS

* Tue May 29 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-3
- Changed all commands to macros
- Removed icon sources and create icons in spec from xournal icon
- Added 64x64 and 128x128 icons
- Consolidated icon directories with wildcards
- Added timestamp preservation to install
- Removed desktop categories Application and X-Fedora
- Added NOCONFIGURE to autogen.sh to stop auto-conf from running twice
- Removed desktop-file-utils post and postun requires
- Removed manual from doc section; it is already installed by the package
- Changed xournal.desktop, xournal.xml and x-xoj.desktop from here documents to files
- Add ImageMagick buildrequires for convert command
- Separated BuildRequires into one per line for easier reading
- Added PACKAGE_LOCALE_DIR CFLAG to configure

* Fri May 18 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-2
- Added mimetype support for gnome and kde
- Made xournal.desktop a here document

* Sat May 12 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-1
- Initial version



--- NEW FILE xournal.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-xoj">
    <sub-class-of type="application/x-pdf" />
    <comment>Xournal Notes</comment>
    <glob pattern="*.[xX][oO][jJ]" />
  </mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2007 18:38:29 -0000	1.1
+++ .cvsignore	1 Jun 2007 20:01:00 -0000	1.2
@@ -0,0 +1 @@
+xournal-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jun 2007 18:38:29 -0000	1.1
+++ sources	1 Jun 2007 20:01:00 -0000	1.2
@@ -0,0 +1 @@
+c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz


