rpms/pybliographer/devel .cvsignore, 1.2, 1.3 pybliographer.spec, 1.2, 1.3 sources, 1.2, 1.3

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv1885/devel

Modified Files:
	.cvsignore pybliographer.spec sources 
Log Message:
Sync with fedora.us 1.2.5-0.fdr.2 from Zoltan.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:14:14 -0000	1.2
+++ .cvsignore	1 Dec 2004 16:13:25 -0000	1.3
@@ -1 +1,2 @@
 pybliographer-1.2.4.tar.gz
+pybliographer-1.2.5.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pybliographer.spec	8 Nov 2004 05:14:20 -0000	1.2
+++ pybliographer.spec	1 Dec 2004 16:13:25 -0000	1.3
@@ -1,35 +1,32 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
-Version: 1.2.4
-Release: 0.fdr.1.2
+Version: 1.2.5
+Release: 1
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.4.tar.gz
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.5.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-PreReq: scrollkeeper >= 0:0.1.4
-
-BuildRequires: python >= 0:2.2
-BuildRequires: pygtk2 >= 0:2.0.0
 BuildRequires: pygtk2-libglade >= 0:2.0.0
 BuildRequires: gnome-python2 >= 0:2.0.0
 BuildRequires: gnome-python2-gconf >= 0:2.0.0
 BuildRequires: python-bibtex >= 0:1.1.93.1
 BuildRequires: gettext
-BuildRequires: scrollkeeper >= 0:0.1.4
+BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
-BuildRequires: intltool
 
-Requires: python >= 0:2.2
-Requires: pygtk2 >= 0:2.0.0
 Requires: pygtk2-libglade >= 0:2.0.0
 Requires: gnome-python2 >= 0:2.0.0
 Requires: gnome-python2-gconf >= 0:2.0.0
 Requires: python-bibtex >= 0:1.1.93.1
-Requires: recode >= 0:3.6-11
+
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 
 %description
@@ -50,12 +47,14 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+%__rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
+
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-category X-Fedora                                   \
@@ -63,22 +62,38 @@
 
 %__rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
+# Compile .pyc and .pyo
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{_datadir}/pybliographer', ddir='%{_datadir}/pybliographer', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{_datadir}/pybliographer', ddir='%{_datadir}/pybliographer', force=1)"
+
 
 %{find_lang} %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 scrollkeeper-update
 
+# run update-desktop-database if exists
+if [ -x /usr/bin/update-desktop-database ]; then
+	/usr/bin/update-desktop-database %{_datadir}/applications
+fi
+
+
 %postun
 scrollkeeper-update
 
+# run update-desktop-database if exists
+if [ -x /usr/bin/update-desktop-database ]; then
+	/usr/bin/update-desktop-database %{_datadir}/applications
+fi
+
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING* ChangeLog* INSTALL NEWS README TODO
+%doc AUTHORS COPYING* ChangeLog* NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/fedora-pybliographic.desktop
 %{_datadir}/gnome/help/pybliographer
@@ -86,7 +101,30 @@
 %{_datadir}/omf/pybliographer
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/pybliographer
-%{_datadir}/pybliographer/Pyblio
+%dir %{_datadir}/pybliographer/Pyblio
+%dir %{_datadir}/pybliographer/Pyblio/ConfDir
+%{_datadir}/pybliographer/Pyblio/ConfDir/*.py
+%{_datadir}/pybliographer/Pyblio/ConfDir/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/ConfDir/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Format
+%{_datadir}/pybliographer/Pyblio/Format/*.py
+%{_datadir}/pybliographer/Pyblio/Format/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Format/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/GnomeUI
+%{_datadir}/pybliographer/Pyblio/GnomeUI/*.py
+%{_datadir}/pybliographer/Pyblio/GnomeUI/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/GnomeUI/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Output
+%{_datadir}/pybliographer/Pyblio/Output/*.py
+%{_datadir}/pybliographer/Pyblio/Output/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Output/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Style
+%{_datadir}/pybliographer/Pyblio/Style/*.py
+%{_datadir}/pybliographer/Pyblio/Style/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Style/*.pyo
+%{_datadir}/pybliographer/Pyblio/*.py
+%{_datadir}/pybliographer/Pyblio/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/*.pyo
 %{_datadir}/pybliographer/Styles
 %{_datadir}/pybliographer/glade
 %{_datadir}/pybliographer/pybcheck.py
@@ -96,10 +134,40 @@
 %{_datadir}/pybliographer/pybliographic.py
 %{_datadir}/pybliographer/pybtex.py
 %{_datadir}/pybliographer/pybtext.py
+%ghost %{_datadir}/pybliographer/pybcheck.pyc
+%ghost %{_datadir}/pybliographer/pybcompact.pyc
+%ghost %{_datadir}/pybliographer/pybconvert.pyc
+%ghost %{_datadir}/pybliographer/pybformat.pyc
+%ghost %{_datadir}/pybliographer/pybliographic.pyc
+%ghost %{_datadir}/pybliographer/pybtex.pyc
+%ghost %{_datadir}/pybliographer/pybtext.pyc
+%ghost %{_datadir}/pybliographer/pybcheck.pyo
+%ghost %{_datadir}/pybliographer/pybcompact.pyo
+%ghost %{_datadir}/pybliographer/pybconvert.pyo
+%ghost %{_datadir}/pybliographer/pybformat.pyo
+%ghost %{_datadir}/pybliographer/pybliographic.pyo
+%ghost %{_datadir}/pybliographer/pybtex.pyo
+%ghost %{_datadir}/pybliographer/pybtext.pyo
 %config %{_datadir}/pybliographer/pybrc.py
 %ghost %{_datadir}/pybliographer/pybrc.pyc
+%ghost %{_datadir}/pybliographer/pybrc.pyo
+
 
 %changelog
+* Mon Nov 29 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.5-1
+- removed redundant dependencies
+- fixed directories in file list
+- fixed scrollkeeper and desktop-file-utils requirements
+
+* Fri Nov 26 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.5-0.fdr.1
+- update to 1.2.5
+- check for update-desktop-database (new mime system),
+  so requires desktop-file-utils
+- removed intltool from buildreq, this stuff is used now
+  in the make-dist phase
+- (re)compile pyc and pyo files. pyo and redundant pyc
+  files are ghosted
+
 * Mon Jul 19 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.1
 - update to 1.2.4
 - using macros for rm and localstatedir


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:14:14 -0000	1.2
+++ sources	1 Dec 2004 16:13:25 -0000	1.3
@@ -1 +1 @@
-5b8d08811ea6a3b2892ab39b4768049c  pybliographer-1.2.4.tar.gz
+b909a988a5e25f23669b7f03a8ea739f  pybliographer-1.2.5.tar.gz