rpms/revelation/devel .cvsignore, 1.3, 1.4 revelation.spec, 1.4, 1.5 sources, 1.3, 1.4

Wed Mar 2 19:05:17 UTC 2005

Author: thl

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

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
Update to 0.4.0; heavy changes on BR and Req, use shared-mime-info and desktop-file-utils; x86_64 suboptimal for now, but working


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.3
+++ .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-revelation-0.3.4.tar.bz2
+revelation-0.4.0.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- revelation.spec	28 Feb 2005 21:12:57 -0000	1.4
+++ revelation.spec	2 Mar 2005 19:05:15 -0000	1.5
@@ -1,30 +1,32 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.3.4
+Version: 	0.4.0
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.3.4.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
-Requires:	gtk2 >= 0:2.2
-Requires:	pygtk2 >= 0:2.2
-Requires:	gnome-python2 >= 0:2.0
+Requires:	pygtk2 >= 0:2.4
 Requires:	gnome-python2-gconf >= 0:2.0
-Requires:       python-abi = %{pyver}
+Requires:	gnome-python2-gnomevfs >= 0:2.6
 BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.2
+BuildRequires:  python-devel >= 0:2.3
+BuildRequires:  pygtk2-devel >= 0:2.4
 BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	libgnomeui-devel >= 0:2.8
+BuildRequires:	gnome-keyring-devel >= 0:0.4.0
+BuildRequires:	desktop-file-utils 
+BuildRequires:	python-crypto >= 0:2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	GConf2
-Requires(preun):GConf2
-BuildArch:      noarch
+Requires(post):	 GConf2 shared-mime-info desktop-file-utils
+Requires(preun): GConf2
+Requires(postun):shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -34,13 +36,14 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%configure --disable-desktop-update --disable-mime-update 
+make %{?_smp_mflags}
+
 
 %install
 %{__rm} -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --vendor fedora \
@@ -53,12 +56,17 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
  
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+
+%postun
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -71,18 +79,34 @@
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
 %{_datadir}/revelation/
+%{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+#dir %{python_sitearch}/revelation/
+# the next entry should be python_sitearch, but the packages currently does it 
+# wrong on install and during execution. So leave it in {python_sitelib} for now
+%{python_sitelib}/revelation/authmanager.so
+%dir %{python_sitelib}/revelation/
+%dir %{python_sitelib}/revelation/datahandler/
+%{_datadir}/mime/packages/*
 %{python_sitelib}/revelation/*.py
 %{python_sitelib}/revelation/*.pyc
 %ghost %{python_sitelib}/revelation/*.pyo
 %{python_sitelib}/revelation/datahandler/*.py
 %{python_sitelib}/revelation/datahandler/*.pyc
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
-%dir %{python_sitelib}/revelation/
-%dir %{python_sitelib}/revelation/datahandler/
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
+- Update to 0.4.0 - depends on gtk 2.4 now
+- Uses configure now
+- add BR pygtk2-devel gnome-keyring-devel
+- use shared-mime-info and desktop-file-utils
+- Remove unneeded explicit Requires 
+- not a noarch package anymore
+- on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
+  will report upstream
+
 * Wed Sep 29 2004 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.3.4-0.fdr.1
 - Update to 0.3.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:17:52 -0000	1.3
+++ sources	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-1b5d3b02bf5cce6568082c39cf74f9e6  revelation-0.3.4.tar.bz2
+d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2


