rpms/regexxer/FC-5 .cvsignore, 1.2, 1.3 regexxer.spec, 1.6, 1.7 sources, 1.2, 1.3

Christoph Wickert (cwickert) fedora-extras-commits at redhat.com
Sun Feb 25 03:24:55 UTC 2007


Author: cwickert

Update of /cvs/extras/rpms/regexxer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28860

Modified Files:
	.cvsignore regexxer.spec sources 
Log Message:
update to 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/regexxer/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Sep 2005 00:18:35 -0000	1.2
+++ .cvsignore	25 Feb 2007 03:24:22 -0000	1.3
@@ -1 +1 @@
-regexxer-0.8.tar.gz
+regexxer-0.9.tar.gz


Index: regexxer.spec
===================================================================
RCS file: /cvs/extras/rpms/regexxer/FC-5/regexxer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regexxer.spec	29 Jul 2006 14:44:20 -0000	1.6
+++ regexxer.spec	25 Feb 2007 03:24:22 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           regexxer
-Version:        0.8
-Release:        5%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        A nifty GUI search/replace tool
 
 Group:          Applications/Text
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel, libglademm24-devel
-BuildRequires:	gconfmm26-devel >= 2.6.1, pcre-devel >= 4.0.0
+BuildRequires:  gconfmm26-devel >= 2.6.1, pcre-devel >= 5.0.0
 BuildRequires:	desktop-file-utils, gettext
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -27,22 +27,21 @@
 
 %build
 # Workaround for libglade bug (#184038)
-%if "%{?fedora}" > "4"
-CXXFLAGS="${RPM_OPT_FLAGS} -Wl,--export-dynamic"
-%endif
-%configure
+#%if "%{?fedora}" > "4"
+#CXXFLAGS="${RPM_OPT_FLAGS} -Wl,--export-dynamic"
+#%endif
+%configure --disable-schemas-install
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-	--delete-original                                       \
+        --remove-category Application                           \
+        --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
@@ -65,6 +64,9 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -73,6 +75,10 @@
       %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 fi
 
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -80,18 +86,20 @@
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}.png
-
+%{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 %changelog
+* Sun Feb 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9-1
+- Update to 0.9.
+
 * Sat Jul 29 2006 Christoph Wickert <fedora at christoph-wickert de> - 0.8-5
 - Bump release to fix upgrade path.
 
 * Sun Mar 05 2006 Christoph Wickert <fedora wickert at arcor de> - 0.8-4
 - Compile with "-Wl,--export-dynamic" on Core 5 (#184001).
-- Don't kill gconfd in %pre, %post and %preun any longer (#173869).
-- Fix typo in %changelog.
+- Don't kill gconfd in %%pre, %%post and %%preun any longer (#173869).
+- Fix typo in %%changelog.
 
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.8-3
 - Rebuild for Fedora Extras 5.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/regexxer/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2005 00:18:35 -0000	1.2
+++ sources	25 Feb 2007 03:24:22 -0000	1.3
@@ -1 +1 @@
-acaa19b119cc7159c42b7f93e02f9fbd  regexxer-0.8.tar.gz
+3c45ed51f28c3d1c7228dff7fb904459  regexxer-0.9.tar.gz




More information about the scm-commits mailing list