rpms/qa-assistant/FC-4 qa-assistant.spec,1.7,1.8
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Fri Sep 1 14:43:44 UTC 2006
Author: toshio
Update of /cvs/extras/rpms/qa-assistant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10518
Modified Files:
qa-assistant.spec
Log Message:
- No longer %ghost .pyo files.
- Switch to disabling installing the schema into GConf via a configure
flag rather than an environment variable.
Index: qa-assistant.spec
===================================================================
RCS file: /cvs/extras/rpms/qa-assistant/FC-4/qa-assistant.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qa-assistant.spec 12 May 2005 05:25:42 -0000 1.7
+++ qa-assistant.spec 1 Sep 2006 14:43:43 -0000 1.8
@@ -1,15 +1,11 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
-%{!?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)")}
-
Name: qa-assistant
-Version: 0.4.1
-Release: 3
+Version: 0.4.90.5
+Release: 2%{?dist}
Summary: Graphical quality assurance report generator
Group: Development/Tools
License: GPL
-URL: http://sourceforge.net/projects/qa-assistant
-Source0: http://dl.sourceforge.net/qa-assistant/qa-assistant-%{version}.tar.bz2
+URL: http://developer.berlios.de/projects/qa-assistant/
+Source0: http://download.berlios.de/qa-assistant/qa-assistant-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -17,21 +13,21 @@
BuildRequires: sed
BuildRequires: desktop-file-utils
# Needed to get xmlcatalog
-BuildRequires: libxml2
-BuildRequires: pygtk2-devel >= 2.2.0
-BuildRequires: pkgconfig
-BuildRequires: gtk2-devel
-BuildRequires: gnome-python2
-Requires: python-abi = %{pyver}
-Requires: libxml2-python
-Requires: gnome-python2
-Requires: pygtk2 >= 2.2.0
-Requires: rpm-python
+BuildRequires: libxml2-devel
+BuildRequires: pygtk2-devel >= 2.4.0
+BuildRequires: pkgconfig
+BuildRequires: gtk2-devel
+BuildRequires: gnome-python2 >= 2.10.0
+Requires: libxml2-python
+Requires: gnome-python2
+Requires: gnome-python2-gconf
+Requires: pygtk2 >= 2.4.0
+Requires: rpm-python
Requires(post): /usr/bin/xmlcatalog
Requires(postun): /usr/bin/xmlcatalog
-#Requires(pre): GConf2
-#Requires(post): GConf2
-#Requires(postun): GConf2
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(postun): GConf2
%description
QA Assistant is a GNOME Application that presents the user with a graphical
@@ -44,16 +40,17 @@
%build
-%configure
+%configure --disable-schemas-install
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
# For GConf apps:
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/qa-assistant.desktop
-desktop-file-install --vendor=fedora --dir=$RPM_BUILD_ROOT%{_datadir}/applications --add-category=X-Fedora qa-assistant.desktop
+desktop-file-install --vendor=fedora \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category=X-Fedora \
+ --delete-original $RPM_BUILD_ROOT%{_datadir}/applications/qa-assistant.desktop
# Remove the xmlcatalog b/c we have to generate at install time
rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/xml
@@ -61,13 +58,14 @@
%clean
rm -rf $RPM_BUILD_ROOT
-#%pre
-#if [ "$1" -gt 1 ]; then
-# export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-# gconftool-2 --makefile-uninstall-rule \
-# %{_sysconfdir}/gconf/schemas/qa-assistant.schemas >/dev/null || :
-# killall -HUP gconfd-2 || :
-#fi
+%pre
+# For GConf apps
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+ killall -HUP gconfd-2 || :
+fi
%post
CATALOG=%{_datadir}/xml/qa-assistant/xmlcatalog
@@ -94,25 +92,24 @@
"file://$CATALOG" $ROOTCATALOG
fi
# For GConf apps
-#export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#gconftool-2 --makefile-install-rule \
-# %{_sysconfdir}/gconf/schemas/qa-assistant.schemas > /dev/null || :
-#killall -HUP gconfd-2 || :
-
-#%preun
-#if [ "$1" -eq 0 ]; then
-# export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-# gconftool-2 --makefile-uninstall-rule \
-# %{_sysconfdir}/gconf/schemas/qa-assistant.schemas > /dev/null || :
-# killall -HUP gconfd-2 || :
-#fi
-
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/qa-assistant.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/qa-assistant.schemas > /dev/null || :
+ killall -HUP gconfd-2 || :
+fi
%postun
#
# On removal, unregister the xmlcatalog from the supercatalog
#
-if [ "$1" = "0" ]; then
+if [ "$1" = 0 ]; then
ROOTCATALOG=%{_sysconfdir}/xml/catalog
if [ -w $ROOTCATALOG ]
@@ -129,19 +126,35 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
-%doc PREFERENCES TODO
+%doc TODO
+%{_sysconfdir}/gconf/schemas/*
%{_bindir}/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/data
-%{_datadir}/%{name}/glade
-%{_datadir}/%{name}/*.py
-%{_datadir}/%{name}/*.pyc
-%ghost %{_datadir}/%{name}/*.pyo
+%{_datadir}/%{name}/
%{_datadir}/xml/%{name}
%changelog
+* Thu Aug 31 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.4.90.5-2
+- No longer %%ghost .pyo files.
+- Switch to disabling installing the schema into GConf via a configure
+ flag rather than an environment variable.
+
+* Mon Jul 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.4.90.5-1.1
+- make check needs to open an X Display. Disable make check for now.
+
+* Sun Jul 16 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.4.90.5-1
+- Update to development version 0.4.90.5 because we're incompatible with the
+ version of pygtk in FC5+.
+- Update pygtk2 requirement to 2.4.0; gnome-python to 2.10.0.
+- Register GConf schema.
+- Switch webpage and download location to berlios.
+
+* Thu Feb 16 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4.1-4
+- Bump and rebuild for FC5.
+- Let python(abi) requirement be detected by rpm.
+- Add dist tag.
+
* Thu May 12 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4.1-3
- Bump release and build to sync across architectures.
More information about the fedora-extras-commits
mailing list