rpms/glipper/devel .cvsignore, 1.4, 1.5 glipper.spec, 1.8, 1.9 sources, 1.4, 1.5

[Damien Durand (splinux)]

Author: splinux

Update of /cvs/pkgs/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14937/devel

Modified Files:
	.cvsignore glipper.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glipper/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Nov 2006 19:23:49 -0000	1.4
+++ .cvsignore	15 Aug 2007 09:36:42 -0000	1.5
@@ -1 +1 @@
-glipper-0.95.1.tar.gz
+glipper-1.0.tar.bz2


Index: glipper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glipper.spec	21 Nov 2006 20:04:13 -0000	1.8
+++ glipper.spec	15 Aug 2007 09:36:42 -0000	1.9
@@ -1,20 +1,37 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:           glipper
-Version:        0.95.1
-Release:        2%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://sourceforge.net/projects/glipper/
-Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel, pygtk2-devel, gnome-python2-devel
 
 
 %description
 Glipper is a simple Clipboardmanager for the GNOME Desktop Environment
 
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
 
@@ -24,29 +41,81 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category Text                                  \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
 %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/glipper.schemas >/dev/null
+    killall -HUP gconfd-2 || :
+fi
+
+
+%post
+update-desktop-database &> /dev/null || :
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/glipper.schemas > /dev/null
+killall -HUP gconfd-2 || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+update-desktop-database &> /dev/null || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/glipper.schemas > /dev/null
+    killall -HUP gconfd-2 || :
+fi
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/gnome/help/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/gnome/help/%{name}
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_libdir}/%{name}
+%{_libdir}/bonobo/servers/Glipper.server
+%{python_sitelib}/%{name}
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug 14 2007 Damien Durand <splinux at fedoraproject.org> - 1.0-1
+- Upgrade to 1.0
+- Add pygtk2-devel, gnome-python2-devel in BR
+- Fix Gconf shemas
+- Fix GTK+ icon cache
+- Add python_sitelib
+- Remove old desktop file
+- add glipper-devel
+
+
 * Tue Nov 21 2006 Damien Durand <splinux at fedoraproject.org> - 0.95.1-2
 - Add libgnome-devel in BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glipper/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Nov 2006 19:23:49 -0000	1.4
+++ sources	15 Aug 2007 09:36:42 -0000	1.5
@@ -1 +1 @@
-aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz
+95315e62b950877611d4645a0b47e1ba  glipper-1.0.tar.bz2