SPECS: anjuta.spec - fix inner deps

Tue Jan 2 02:41:33 CET 2007

Author: glen                         Date: Tue Jan  2 01:41:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix inner deps

---- Files affected:
SPECS:
   anjuta.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: SPECS/anjuta.spec
diff -u SPECS/anjuta.spec:1.96 SPECS/anjuta.spec:1.97

--- SPECS/anjuta.spec:1.96	Tue Jan  2 00:05:48 2007
+++ SPECS/anjuta.spec	Tue Jan  2 02:41:28 2007
@@ -43,6 +43,7 @@
 BuildRequires:	vte-devel >= 0.11.0
 Requires(post,postun):	scrollkeeper
 # Requires:	gnome-terminal
+Requires:	libanjuta = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,6 +81,7 @@
 %package -n libanjuta
 Summary:	libanjuta library
 Group:		Development/Libraries
+Conflicts:	%{name} < 1:2.0.2-1
 
 %description -n libanjuta
 libanjuta library.
@@ -138,7 +140,7 @@
 %postun
 %scrollkeeper_update_postun
 
-%post -n libanjuta -p /sbin/ldconfig
+%post	-n libanjuta -p /sbin/ldconfig
 %postun -n libanjuta -p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -176,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2007/01/02 01:41:28  glen
+- fix inner deps
+
 Revision 1.96  2007/01/01 23:05:48  arekm
 - rel 1; more files packaged
 
@@ -236,9 +241,9 @@
 - rel 4
 
 Revision 1.79  2004/09/15 18:24:36  grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
-  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
-  %%{__aclocal} args and BR: gnome-common >= 2.8.0
+- in gnome-common-2.8.0 all macros are in %{_aclocaldir}, not in
+  %{_aclocaldir}/gnome2-macros, so remove -I %{_aclocal}/gnome2-macros from
+  %{__aclocal} args and BR: gnome-common >= 2.8.0
 
 Revision 1.78  2004/07/29 20:22:26  qboosh
 - fixed build (plugins path) on amd64, release 3
@@ -278,7 +283,7 @@
 - removed outdated am patch
 - updated BRs (libzvt is no longer needed)
 - added  --enable-gprof
-- added %%post/%%postun -p /usr/bin/scrollkeeper-update
+- added %post/%postun -p /usr/bin/scrollkeeper-update
 
 Revision 1.68  2003/08/26 20:31:18  ankry
 - s/[Gg]nome/GNOME/
@@ -290,7 +295,7 @@
 - mass commit: cosmetics (removed trailing white spaces)
 
 Revision 1.65  2003/08/11 20:44:51  ankry
-cosmetics
+- cosmetics
 
 Revision 1.64  2003/08/06 16:09:47  kloczek
 - może wrescie ktoś wykasuje to konto ?
@@ -330,7 +335,7 @@
 Revision 1.53  2003/03/19 14:38:08  grzegol
 - updated to 20030319 snap
 - fixed and sorted BRs
-- fixed %%files
+- fixed %files
 
 Revision 1.52  2003/03/15 16:13:26  zytek
 - BR: ncurses-devel
@@ -386,8 +391,8 @@
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.38  2002/10/03 17:59:41  krzak
-Release 8
-fixed omf files patch
+- Release 8
+- fixed omf files patch
 
 Revision 1.37  2002/09/17 10:44:56  marcus
 - added patch to not rebuild system tags
@@ -403,7 +408,7 @@
 - release 5.
 
 Revision 1.34  2002/06/23 20:52:48  kloczek
-perl -pi -e "s/^gettextize --copy --force/\%%\{__gettextize\}/"
+- perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/"
 
 Revision 1.33  2002/06/23 20:32:20  kloczek
 - perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
@@ -419,9 +424,9 @@
 - use new %doc and add "rm -f missing" on top %build.
 
 Revision 1.30  2002/05/21 23:12:41  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.29  2002/05/17 14:28:59  michuz
 - fixed omf filse location
@@ -443,7 +448,7 @@
 - removed -no-rtti from CXXFLAGS
 
 Revision 1.23  2002/04/28 03:21:09  michuz
-- more %%files update
+- more %files update
 
 Revision 1.22  2002/04/28 03:08:01  michuz
 - removed doubled BR
@@ -452,7 +457,7 @@
 - updated to 0.1.9
 
 Revision 1.20  2002/04/25 15:44:29  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.19  2002/03/24 23:28:13  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -477,15 +482,15 @@
 - release 3.
 
 Revision 1.14  2002/02/10 20:23:14  adasi
- - added missing libxml-devel BuildReqs
+- added missing libxml-devel BuildReqs
 
 Revision 1.13  2002/02/10 01:45:11  blues
 - adapterized
 - sed-patching used
-NOTE: still does not build.
+  NOTE: still does not build.
 
 Revision 1.12  2002/01/18 02:12:19  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.11  2001/12/13 18:33:21  kloczek
 - release 2: use intltool instead outdated xml-i18n-tools.
@@ -502,7 +507,7 @@
 Revision 1.7  2001/06/29 21:12:03  kloczek
 - added am_fixes patch: dix passing CXXFLAGS to compile C++ code,
 - added missing BuildRequires (libstdc++-devel, gnome-libs-devel),
-- use %%find_lang macro for collect all languages depending files,
+- use %find_lang macro for collect all languages depending files,
 - regenerate ac/am/lt/gettext files,
 - pass -fno-rtti -fno-exceptions to C++ compile flags (smaller binaries),
 - use more macros in %files,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/anjuta.spec?r1=1.96&r2=1.97&f=u

