rpms/scribes/FC-6 .cvsignore, 1.11, 1.12 scribes.spec, 1.21, 1.22 sources, 1.11, 1.12

Sat May 19 19:30:23 UTC 2007

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23412

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3.2.3; sync with devel and F-7 branches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12

--- .cvsignore	1 Apr 2007 20:18:13 -0000	1.11
+++ .cvsignore	19 May 2007 19:29:49 -0000	1.12
@@ -1 +1 @@
-scribes-0.3.2.tar.bz2
+scribes-0.3.2.5.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scribes.spec	1 Apr 2007 20:16:39 -0000	1.21
+++ scribes.spec	19 May 2007 19:29:49 -0000	1.22
@@ -3,14 +3,14 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.3.2
+Version:	0.3.2.5
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
 URL:		http://scribes.sourceforge.net/           
 
-Source0:	http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-configure.ac-no-python-depcheck.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,44 +74,52 @@
 
 %prep
 %setup -q
-# Patch out the configure script's call to depcheck.py, since I've ensured
-# that the deps are satisfied and the depcheck.py script is happy on its own,
-# though fails when run through rpmbuild...
+## Patch out the configure script's call to depcheck.py, since I've ensured
+## that the deps are satisfied and the depcheck.py script is happy on its own,
+## though fails when run through rpmbuild...
 %patch0 -p0
-# ..then recreate the configure script from the new configure.ac file...
+## ..then recreate the configure script from the new configure.ac file...
 %{__autoconf}
-# ..then recreate the root Makefile.in for the configure script to use...
+## ..then recreate the root Makefile.in for the configure script to use...
+%{__aclocal}
 %{__automake} Makefile
-# ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
-# since they'll be installed with the scriptlets.
-%configure --disable-scrollkeeper --disable-schemas-install --enable-nls
+find . -type f -exec sed -i -e "s/@MKDIR_P@/@mkdir_p@/g" '{}' \;
 
 
 %build
+## Scrollkeeper and GConf schema installations are disabled since they'll be
+## handled with the scriptlets.
+%configure --disable-scrollkeeper --disable-schemas-install --enable-nls
 make %{?_smp_mflags}
 
 
-%pre
-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 ||:
-fi
-
-
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
+	--remove-category=Application	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
+## Fix some plugin script permissions...
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
 %find_lang %{name}
 
 
+%clean
+rm -rf %{buildroot}
+
+
+%pre
+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 ||:
+fi
+
+
 %post
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule \
@@ -122,10 +130,6 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
@@ -147,7 +151,7 @@
 %{python_sitelib}/%{python_module_name}/
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/%{name}.svg
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -156,6 +160,23 @@
 
 
 %changelog
+* Sat May 19 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.5-1
+- Update to new upstream release (0.3.2.5).
+- Sync various spec file fixes from devel and F-7 branches.
+
+* Sat Apr 28 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.2-1
+- Update to new upstream release (0.3.2.2).
+- Drop fix-Job.py-print-header-path fix (merged upstream):
+  - fix-Job.py-print-header-path.patch
+
+* Tue Apr 24 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.1-1
+- Update to new upstream release (0.3.2.1).
+- Add patch to fix the header of print jobs (incomplete filenames):
+  + fix-Job.py-print-header-path.patch
+- Move %%configure call to %%build stage (%%prep should only be source
+  unpacking/patching/etc).
+- Reorder scriptlets (aesthetic change only).
+
 * Sun Apr 01 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2-1
 - Update to new upstream release (0.3.2).
 - Update %%post and %%postun scriplets for new icon-cache guidelines. 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Apr 2007 20:18:13 -0000	1.11
+++ sources	19 May 2007 19:29:49 -0000	1.12
@@ -1 +1 @@
-93b052fce4b1975020b0b6521c1bb920  scribes-0.3.2.tar.bz2
+d5931f73520af92ee00a16b77bd17ba2  scribes-0.3.2.5.tar.bz2


