rpms/gchempaint/devel gchempaint-0.8.2-themedirfix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gchempaint.spec, 1.7, 1.8 sources, 1.5, 1.6

Mon Aug 6 13:18:24 UTC 2007

Author: belegdol

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

Modified Files:
	.cvsignore gchempaint.spec sources 
Added Files:
	gchempaint-0.8.2-themedirfix.patch 
Log Message:
* Sun Jul 29 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-1
- Updated to 0.8.2
- Merged the useless -devel package with the main one
- Fixed bogus theme dir


gchempaint-0.8.2-themedirfix.patch:

--- NEW FILE gchempaint-0.8.2-themedirfix.patch ---
--- gchempaint-0.8.2/themes/Makefile.am.themedirfix	2007-07-29 12:29:09.000000000 +0100
+++ gchempaint-0.8.2/themes/Makefile.am	2007-07-29 12:29:21.000000000 +0100
@@ -1,4 +1,4 @@
-themesdir = $(datadir)/gchemutils-unstable/paint/themes
+themesdir = $(datadir)/gchempaint/themes
 themes_DATA = \
 	ACS_Document_1996
 
--- gchempaint-0.8.2/themes/Makefile.in.themedirfix	2007-07-29 12:24:44.000000000 +0100
+++ gchempaint-0.8.2/themes/Makefile.in	2007-07-29 12:26:01.000000000 +0100
@@ -221,7 +221,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-themesdir = $(datadir)/gchemutils-unstable/paint/themes
+themesdir = $(datadir)/gchempaint/themes
 themes_DATA = \
 	ACS_Document_1996
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Apr 2007 15:59:06 -0000	1.5
+++ .cvsignore	6 Aug 2007 13:17:52 -0000	1.6
@@ -1 +1 @@
-gchempaint-0.6.9.tar.bz2
+gchempaint-0.8.2.tar.bz2


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gchempaint.spec	9 Apr 2007 15:59:06 -0000	1.7
+++ gchempaint.spec	6 Aug 2007 13:17:52 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           gchempaint
-Version:        0.6.9
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        A 2D chemical formulae drawing tool
 
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://www.nongnu.org/gchempaint/
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.bz2
+Patch0:         gchempaint-0.8.2-themedirfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-chemistry-utils-devel
@@ -26,29 +27,17 @@
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+Obsoletes:      gchempaint-devel
+
 %description
 GChemPaint is a 2D chemical structures editor for the Gnome-2 desktop.
 GChemPaint is a multi document application and is a bonobo server so that some
 chemistry can be embedded in other Gnome applications.
 
-#disable -devel package for now
-#%package        devel
-#Summary:        Development package for %{name}
-#Group:          Development/Libraries
-#Requires:       %{name} = %{version}-%{release}
-#Requires:       gnome-chemistry-utils-devel
-#Requires:       libbonoboui-devel
-
-#%description    devel
-#GChemPaint is a 2D chemical structures editor for the Gnome-2 desktop.
-#GChemPaint is a multi document application and is a bonobo server so that some
-#chemistry can be embedded in other Gnome applications. This package contains
-#development files for %{name}
-
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .themedirfix
 
 %build
 %configure --disable-update-databases \
@@ -70,10 +59,7 @@
 #kill libtool archives
 rm -f $RPM_BUILD_ROOT%{_libdir}/gchempaint/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.la
-
-#kill headers and .so file for now, until undefined non-weak symbols issue is fixed
-rm -rf $RPM_BUILD_ROOT%{_includedir}/gchempaint
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas.la
 
 
 %clean
@@ -89,12 +75,24 @@
     #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
     killall -HUP gconfd-2 || :
 fi
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gchempaint.schemas >/dev/null || :
+    # If the schema file has ever been renamed::
+    #gconftool-2 --makefile-uninstall-rule \
+    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gchempaint.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
@@ -109,6 +107,13 @@
       %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas > /dev/null || :
     killall -HUP gconfd-2 || :
 fi
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gchempaint.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
 
 %postun
 update-desktop-database &> /dev/null ||:
@@ -123,11 +128,14 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README TODO
 %{_bindir}/gchempaint
-%{_bindir}/gchempaint-viewer
-%{_libdir}/bonobo/servers/gchempaint.server
 %{_libdir}/gchempaint
-%{_libdir}/libgchempaint.so.*
+%{_libdir}/libgchempaint-%{version}.so
+%{_libdir}/libgcpcanvas-%{version}.so
+%{_libdir}/libgcpcanvas.so
+%{_libdir}/libgchempaint.so
+%{_libdir}/goffice/0.4.0/plugins/gchempaint
 %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
+%{_sysconfdir}/gconf/schemas/gchempaint.schemas
 %{_datadir}/applications/fedora-gchempaint.desktop
 %{_datadir}/gchempaint
 %{_datadir}/icons/hicolor/*/apps/gchempaint.png
@@ -137,14 +145,32 @@
 %{_datadir}/mimelnk
 %{_datadir}/omf/gchempaint
 
-#disable -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_includedir}/gchempaint
-#%{_libdir}/libgchempaint.so
-
 
 %changelog
+* Sun Jul 29 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-1
+- Updated to 0.8.2
+- Merged the useless -devel package with the main one
+- Fixed bogus theme dir
+
+* Fri Jun 29 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.1-1
+- Updated to 0.8.1
+- Dropped upstreamed patches
+
+* Sun May 27 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-2
+- Added patch fixing two variable cycle tool issues (Savannah #19932 and #19933)
+
+* Sun May 20 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1
+- Updated to 0.8.0
+
+* Thu May 10 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.96-1
+- Updated to 0.7.96
+
+* Wed May  9 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.95-1
+- Updated to 0.7.95
+
+* Sat Apr 21 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.91-1
+- Updated to 0.7.91
+
 * Mon Apr  9 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.9-1
 - Updated to 0.6.9
 - Switched to bzip2 sources
@@ -180,4 +206,4 @@
 - Preserve timestamps
 
 * Sat Dec 02 2006 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-1
-- Initial RPM release
\ No newline at end of file
+- Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Apr 2007 15:59:06 -0000	1.5
+++ sources	6 Aug 2007 13:17:52 -0000	1.6
@@ -1 +1 @@
-3b81f99972bedccd5f19a6bda785d451  gchempaint-0.6.9.tar.bz2
+b02820894bff474ed1d5861ac644a767  gchempaint-0.8.2.tar.bz2


