Hello community,
here is the log from the commit of package stardict
checked in at Thu Mar 15 15:32:35 CET 2007.
--------
--- stardict/stardict.changes 2007-03-12 14:07:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/stardict/stardict.changes 2007-03-15 13:29:37.281540000 +0100
@@ -2 +2,6 @@
-Mon Mar 12 14:07:09 CET 2007
+Thu Mar 15 13:06:06 CET 2007 - sbrabec@suse.cz
+
+- Fixed schemas installation, spec file cleanup (#254850).
+
+-------------------------------------------------------------------
+Mon Mar 12 14:07:09 CET 2007 - anonymous@anonymous
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stardict.spec ++++++
--- /var/tmp/diff_new_pack.B10286/_old 2007-03-15 15:28:55.000000000 +0100
+++ /var/tmp/diff_new_pack.B10286/_new 2007-03-15 15:28:55.000000000 +0100
@@ -12,11 +12,11 @@
Name: stardict
BuildRequires: gcc-c++ gnome-common intltool libgnomeui-devel mDNSResponder-devel perl-XML-Parser scrollkeeper update-desktop-files
-%define prefix /usr
-%define sysconfdir /etc
+# Only for directory ownership:
+BuildRequires: libidl
Summary: A cross-platform and internationalized dictionary
Version: 2.4.5
-Release: 59
+Release: 60
License: GNU General Public License (GPL)
Group: Productivity/Office/Dictionary
URL: http://stardict.sourceforge.net
@@ -25,7 +25,7 @@
Patch1: stardict.desktop.patch
Patch2: stardict.gcc410.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: stardict = 2.4
+Provides: %{name} = 2.4
%gconf_schemas_prereq
@@ -46,56 +46,48 @@
Alex Murygin
%prep
-%setup -n %{name}-%{version}
+%setup -q
%patch0 -p0
%patch1 -p1
%patch2 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" \
-CXXFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=/usr \
- --libdir=/usr/%{_lib} \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var
-make
+%configure
+make %{?jobs:-j%jobs}
%install
-rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-pushd $RPM_BUILD_ROOT
-popd
-
-%add_gconf_schemas stardict
+%find_lang %{name}
+%find_gconf_schemas
+cat %{name}.lang %{name}.schemas_list >%{name}.lst
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-#export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-#usr/bin/gconftool-2 --makefile-install-rule etc/gconf/schemas/stardict.schemas >/dev/null
-touch var/adm/SuSEconfig/run-scrollkeeper-update
+%pre -f %{name}.schemas_pre
+# Remove orphan file created by stardict.spec in SuSE <= 10.2.
+# Can be removed after openSUSE 10.3.
+rm -f var/adm/SuSEconfig/run-scrollkeeper-update
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
-%files
+%files -f %{name}.lst
%defattr(-,root,root)
-%{prefix}/%{_lib}/bonobo/servers/*
-%{prefix}/bin/*
-%{prefix}/share/applications/*
-%{prefix}/share/gnome
-%{prefix}/share/idl
-%{prefix}/share/locale/*/*/*
-%{prefix}/share/man/*/*
-%{prefix}/share/omf
-%{prefix}/share/pixmaps/*
-%{prefix}/share/stardict
-%{sysconfdir}/gconf/schemas/stardict.schemas
+%{_libdir}/bonobo/servers/*.server
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/idl/*.idl
+%{_datadir}/omf/stardict
+%{_datadir}/pixmaps/*.png
+%{_datadir}/stardict
+%doc %{_mandir}/man?/*.*
%changelog
-* Thu Mar 15 01:49:48 CET 2007 - broken@suse.de
- Mon Mar 12 14:07:09 CET 2007
+* Thu Mar 15 2007 - sbrabec@suse.cz
+- Fixed schemas installation, spec file cleanup (#254850).
+* Mon Mar 12 2007 - anonymous@anonymous
- Use gconf_schemas_prereq
* Mon Jan 08 2007 - ro@suse.de
- fix localstatedir
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org