SPECS: tomboy.spec - proper license - sorted BRs/Rs - removed no l...

[paladine]

Author: paladine                     Date: Tue Aug 23 07:50:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- proper license
- sorted BRs/Rs
- removed no locale
- use new GConf schemas macros
- removed useless scrollkeeper-update
- sorted/fixed %%files
- fixed desktop patch
- rel. 2

---- Files affected:
SPECS:
   tomboy.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/tomboy.spec
diff -u SPECS/tomboy.spec:1.10 SPECS/tomboy.spec:1.11
--- SPECS/tomboy.spec:1.10	Tue Aug 23 08:51:02 2005
+++ SPECS/tomboy.spec	Tue Aug 23 09:49:57 2005
@@ -3,8 +3,8 @@
 Summary(pl):	Tomboy - aplikacja do notatek na pulpicie
 Name:		tomboy
 Version:	0.3.3
-Release:	1
-License:	GPL
+Release:	2
+License:	LGPL v2.1
 Group:		X11/Applications
 Source0:	http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	7ad987216b484f747f53aa7f9055a46b
@@ -17,17 +17,18 @@
 BuildRequires:	dotnet-dbus-sharp-devel
 BuildRequires:	dotnet-gtk-sharp-devel
 BuildRequires:	dotnet-gtk-sharp-gnome-devel
-BuildRequires:	gtkspell-devel >= 2.0.5
 BuildRequires:	gnome-panel-devel
+BuildRequires:	gtkspell-devel >= 2.0.5
 BuildRequires:	intltool >= 0.25
 BuildRequires:	libtool
 BuildRequires:	mono-csharp
 BuildRequires:	pkgconfig
-Requires(post):	GConf2
+BuildRequires:	rpmbuild(macros) >= 1.197
+Requires(post,preun):	GConf2
 Requires:	mono
+Requires:	dotnet-dbus-sharp
 Requires:	dotnet-gtk-sharp
 Requires:	dotnet-gtk-sharp-gnome
-Requires:	dotnet-dbus-sharp
 Requires:	gnome-panel
 ExclusiveArch:	%{ix86} %{x8664} alpha arm hppa ppc s390 sparc sparcv9 sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,11 +54,11 @@
 %{__automake}
 %configure \
 	--disable-schemas-install
-
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services}
 
 %{__make} install \
@@ -67,34 +68,37 @@
 mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \
 	$RPM_BUILD_ROOT%{_datadir}/dbus-1/services/
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install
-/usr/bin/scrollkeeper-update
+%gconf_schema_install tomboy.schemas
+
+%preun
+%gconf_schema_uninstall tomboy.schemas
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/dbus-1/services/*.service
+%{_datadir}/gnome-2.0/ui/*
+%{_desktopdir}/*.desktop
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.config
-%{_libdir}/%{name}/*.exe
+%attr(755,root,root) %{_libdir}/%{name}/*.exe
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %{_libdir}/%{name}/*.la
-%dir %{_libdir}/%{name}/Plugins
-%{_datadir}/dbus-1/services/*.service
-%{_datadir}/gnome-2.0/ui/*
-%{_desktopdir}/*.desktop
-%{_libdir}/%{name}/Plugins/*.dll
+%{_libdir}/%{name}/Plugins
 %{_libdir}/bonobo/servers/*
 %{_mandir}/man1/tomboy.1*
 %{_pixmapsdir}/*.png
 %{_pkgconfigdir}/tomboy-plugins.pc
+%{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +106,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/08/23 07:49:57  paladine
+- proper license
+- sorted BRs/Rs
+- removed no locale
+- use new GConf schemas macros
+- removed useless scrollkeeper-update
+- sorted/fixed %%files
+- fixed desktop patch
+- rel. 2
+
 Revision 1.10  2005/08/23 06:51:02  pawcioos
 - fixed path to *.service, desktop
 - cosmetics
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.10&r2=1.11&f=u