rpms/evolution-remove-duplicates/FC-5 evolution-remove-duplicates.spec, 1.6, 1.7 rmdups-0.0.2-pkgconfig.patch, 1.3, 1.4
Michel Alexandre Salim (salimma)
fedora-extras-commits at redhat.com
Wed Dec 13 06:05:40 UTC 2006
Author: salimma
Update of /cvs/extras/rpms/evolution-remove-duplicates/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11543
Modified Files:
evolution-remove-duplicates.spec rmdups-0.0.2-pkgconfig.patch
Log Message:
Adjust settings for FC-5's evolution version
Index: evolution-remove-duplicates.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-remove-duplicates/FC-5/evolution-remove-duplicates.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-remove-duplicates.spec 12 Dec 2006 21:56:23 -0000 1.6
+++ evolution-remove-duplicates.spec 13 Dec 2006 06:05:10 -0000 1.7
@@ -2,7 +2,7 @@
Name: evolution-remove-duplicates
Version: 0.0.2
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: Evolution plugin for removing duplicate mails
Group: Applications/Productivity
@@ -50,12 +50,15 @@
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING
-%{_libdir}/evolution/2.8/plugins/*org-gnome-remove-duplicates.*
-%{_datadir}/evolution/2.8/errors/org-gnome-remove-duplicates.error
+%{_libdir}/evolution/2.6/plugins/*org-gnome-remove-duplicates.*
+%{_datadir}/evolution/2.6/errors/org-gnome-remove-duplicates.error
%changelog
+* Wed Dec 13 2006 Michel Salim <michel.salim at gmail.com> - 0.0.2-3.fc5.1
+- Adjustments for FC-5's evolution 2.6
+
* Thu Dec 7 2006 Michel Salim <michel.salim at gmail.com> - 0.0.2-3
- Add temporary workaround BR on evolution-data-server-devel
rmdups-0.0.2-pkgconfig.patch:
Index: rmdups-0.0.2-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/evolution-remove-duplicates/FC-5/rmdups-0.0.2-pkgconfig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rmdups-0.0.2-pkgconfig.patch 12 Dec 2006 21:56:23 -0000 1.3
+++ rmdups-0.0.2-pkgconfig.patch 13 Dec 2006 06:05:10 -0000 1.4
@@ -5,18 +5,18 @@
elif test -n "$PKG_CONFIG"; then
if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"
- evolution-plugin-2.4 >= \$EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= \$EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= \$EVOLUTION_PLUGIN_REQUIRED
\" >/dev/null 2>&1") >&5
($PKG_CONFIG --exists "
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
" >/dev/null 2>&1) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_REMOVE_DUPLICATES_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
@@ -25,18 +25,18 @@
elif test -n "$PKG_CONFIG"; then
if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"
- evolution-plugin-2.4 >= \$EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= \$EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= \$EVOLUTION_PLUGIN_REQUIRED
\" >/dev/null 2>&1") >&5
($PKG_CONFIG --exists "
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
" >/dev/null 2>&1) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_REMOVE_DUPLICATES_PLUGIN_LIBS=`$PKG_CONFIG --libs "
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
@@ -45,14 +45,14 @@
if test $pkg_failed = yes; then
REMOVE_DUPLICATES_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
"`
# Put the nasty error message in config.log where it belongs
echo "$REMOVE_DUPLICATES_PLUGIN_PKG_ERRORS" 1>&5
{ { echo "$as_me:$LINENO: error: Package requirements (
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -61,7 +61,7 @@
more details." >&5
echo "$as_me: error: Package requirements (
- evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+ evolution-plugin-2.8 >= $EVOLUTION_PLUGIN_REQUIRED
++ evolution-plugin-2.6 >= $EVOLUTION_PLUGIN_REQUIRED
) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -70,11 +70,11 @@
-PLUGINDIR=`pkg-config --variable=plugindir evolution-plugin-2.4`
-+PLUGINDIR=`pkg-config --variable=plugindir evolution-plugin-2.8`
++PLUGINDIR=`pkg-config --variable=plugindir evolution-plugin-2.6`
-ERRORDIR=`pkg-config --variable=errordir evolution-plugin-2.4`
-+ERRORDIR=`pkg-config --variable=errordir evolution-plugin-2.8`
++ERRORDIR=`pkg-config --variable=errordir evolution-plugin-2.6`
ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"
More information about the fedora-extras-commits
mailing list