rpms/evolution-remove-duplicates/FC-5 evolution-remove-duplicates.spec, 1.5, 1.6 rmdups-0.0.2-pkgconfig.patch, 1.2, 1.3

Michel Alexandre Salim (salimma) fedora-extras-commits at redhat.com
Tue Dec 12 21:56:53 UTC 2006


Author: salimma

Update of /cvs/extras/rpms/evolution-remove-duplicates/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11861/FC-5

Modified Files:
	evolution-remove-duplicates.spec rmdups-0.0.2-pkgconfig.patch 
Log Message:
Downgrade FC{5,6} branches to Evo 2.8



Index: evolution-remove-duplicates.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-remove-duplicates/FC-5/evolution-remove-duplicates.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-remove-duplicates.spec	11 Dec 2006 03:19:38 -0000	1.5
+++ evolution-remove-duplicates.spec	12 Dec 2006 21:56:23 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           evolution-remove-duplicates
 Version:        0.0.2
-Release:        6%{?dist}
+Release:        3%{?dist}
 Summary:        Evolution plugin for removing duplicate mails
 
 Group:          Applications/Productivity
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  evolution-devel
+BuildRequires:  libgnomeui-devel
 # Needed because evolution-devel does not Requires: it yet
 # Bz #218889
 BuildRequires:  evolution-data-server-devel
@@ -49,23 +50,12 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
-%{_libdir}/evolution/2.10/plugins/*org-gnome-remove-duplicates.*
-%{_datadir}/evolution/2.10/errors/org-gnome-remove-duplicates.error
+%{_libdir}/evolution/2.8/plugins/*org-gnome-remove-duplicates.*
+%{_datadir}/evolution/2.8/errors/org-gnome-remove-duplicates.error
 
 
 
 %changelog
-* Sun Dec 10 2006 Michel Salim <michel.salim at gmail.com> - 0.0.2-6
-- Adjust file listing for new Evolution
-- Remove unnecessary BR on libgnomeui-devel
-- Add explicit Requires: on evolution
-
-* Sun Dec 10 2006 Michel Salim <michel.salim at gmail.com> - 0.0.2-5
-- Fix pkgconfig patch to use evolution-plugin-2.10.pc
-
-* Sun Dec 10 2006 Michel Salim <michel.salim at gmail.com> - 0.0.2-4
-- Add BR on libgnomeui-devel
-
 * 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rmdups-0.0.2-pkgconfig.patch	11 Dec 2006 00:46:01 -0000	1.2
+++ rmdups-0.0.2-pkgconfig.patch	12 Dec 2006 21:56:23 -0000	1.3
@@ -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.10 >= \$EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= \$EVOLUTION_PLUGIN_REQUIRED
  		  \" >/dev/null 2>&1") >&5
    ($PKG_CONFIG --exists "
 -		  evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+		  evolution-plugin-2.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10 >= \$EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= \$EVOLUTION_PLUGIN_REQUIRED
  		  \" >/dev/null 2>&1") >&5
    ($PKG_CONFIG --exists "
 -		  evolution-plugin-2.4 >= $EVOLUTION_PLUGIN_REQUIRED
-+		  evolution-plugin-2.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10 >= $EVOLUTION_PLUGIN_REQUIRED
++		  evolution-plugin-2.8 >= $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.10`
++PLUGINDIR=`pkg-config --variable=plugindir evolution-plugin-2.8`
  
  
 -ERRORDIR=`pkg-config --variable=errordir evolution-plugin-2.4`
-+ERRORDIR=`pkg-config --variable=errordir evolution-plugin-2.10`
++ERRORDIR=`pkg-config --variable=errordir evolution-plugin-2.8`
  
  
                                ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"




More information about the fedora-extras-commits mailing list