API tools faq
paste
david_david

svn diff gmic

david_david
Aug 24th, 2013
148
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.63 KB | None | 0 0
raw download clone embed print report
  1. $ svn diff
  2. Index: gmic.spec
  3. ===================================================================
  4. --- gmic.spec (révision 471315)
  5. +++ gmic.spec (copie de travail)
  6. @@ -1,32 +1,21 @@
  7. -%define major 1
  8. -
  9. +%define major 1
  10. %define libname %mklibname %{name} %{major}
  11. %define develname %mklibname -d %{name}
  12.  
  13. Name: gmic
  14. Version: 1.5.5.0
  15. -Release: %mkrel 2
  16. +Release: %mkrel 3
  17. Group: Graphics/Utilities
  18. # CeCILL version 2.0
  19. License: CeCILL
  20. Summary: A script language (G'MIC) dedicated to image processing
  21. Url: http://gmic.sourceforge.net
  22. Source: http://sourceforge.net/projects/gmic/files/%{name}_%{version}.tar.gz
  23. -Patch1: %{name}-1.5.1.5-makefile.patch
  24. -Patch2: %{name}-1.5.1.5-zartlibs.patch
  25. -Patch3: %{name}-1.5.1.6-makefile.patch
  26. -Patch4: %{name}-1.5.1.7-makefile.patch
  27. -Patch5: %{name}-1.5.1.8-makefile.patch
  28. -Patch6: %{name}-1.5.1.9-makefile.patch
  29. -Patch7: %{name}-1.5.2.1-makefile.patch
  30. -Patch8: %{name}-1.5.2.4-makefile.patch
  31. -Patch9: %{name}-1.5.4.0-makefile.patch
  32. -Patch10: %{name}-1.5.4.0-gimp-fmtsecurity.patch
  33. -Patch11: %{name}-1.5.5.0-makefile.patch
  34. +Patch0: %{name}-1.5.5.0-makefile.patch
  35.  
  36. -BuildRequires: opencv-devel
  37. -BuildRequires: graphicsmagick-devel
  38. -BuildRequires: fftw-devel
  39. +BuildRequires: pkgconfig(opencv)
  40. +BuildRequires: pkgconfig(GraphicsMagick)
  41. +BuildRequires: pkgconfig(fftw3)
  42. BuildRequires: gimp-devel
  43. BuildRequires: ffmpeg-devel
  44. BuildRequires: qt4-devel
  45. @@ -66,26 +55,26 @@
  46.  
  47. %files
  48. %doc COPYING README
  49. -%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
  50. %{_bindir}/%{name}
  51. %{_mandir}/man1/%{name}.1.*
  52. %{_mandir}/fr/man1/gmic.1.*
  53. +%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
  54.  
  55. #------------------------------------------------------
  56.  
  57. -%package -n zart
  58. +%package -n %{name}-zart
  59. Summary: GUI for G'MIC real-time manipulations on the output of a webcam
  60. Group: Graphics/Utilities
  61. Requires: %{name} = %{version}-%{release}
  62.  
  63. Provides: %{name}-zart = %{version}-%{release}
  64.  
  65. -%description -n zart
  66. +%description -n %{name}-zart
  67. ZArt is a computer program whose purpose is to demonstrate the possibilities of
  68. the G'MIC image processing language by offering the choice of several
  69. manipulations on a video stream acquired from a webcam.
  70.  
  71. -%files -n zart
  72. +%files -n %{name}-zart
  73. %{_bindir}/zart
  74. #%{_datadir}/zart/haarcascade*.xml
  75.  
  76. @@ -96,10 +85,9 @@
  77. Group: Graphics/Utilities
  78. Requires: gimp >= 2.6.0
  79.  
  80. -Obsoletes: %{name}-gimp < 1.5.1.5-1
  81. -
  82. Provides: %{name}-gimp = %{version}-%{release}
  83.  
  84. +Obsoletes: %{name}-gimp < 1.5.1.5-1
  85.  
  86. %description -n gimp-plugin-%{name}
  87. G'MIC has been made available as an easy-to-use plug-in for GIMP.
  88. @@ -113,44 +101,44 @@
  89.  
  90. #------------------------------------------------------
  91.  
  92. -%package -n %libname
  93. +%package -n %{libname}
  94. Summary: Library for gmic
  95. Group: System/Libraries
  96. Requires: %{name} = %{version}-%{release}
  97.  
  98. Obsoletes: %{name} < 1.5.1.5-1
  99. -Provides: %{name} = %{version}-%{release}
  100.  
  101. -%description -n %libname
  102. +%description -n %{libname}
  103. This package contains the library needed to run programs
  104. dynamically linked with gmic.
  105.  
  106. -%files -n %libname
  107. -%{_libdir}/lib%{name}.so.%{major}*
  108. +%files -n %{libname}
  109. +%{_libdir}/lib%{name}.so.%{major}
  110. +%{_libdir}/lib%{name}.so.%{major}.*
  111.  
  112. #------------------------------------------------------
  113.  
  114. -%package -n %develname
  115. +%package -n %{develname}
  116. Summary: Header file for gmic
  117. Group: Development/C++
  118. -Requires: %{name} = %{version}-%{release}
  119. +Requires: %{libname} = %{version}-%{release}
  120.  
  121. +Provides: %{name}-devel = %{version}-%{release}
  122. +
  123. Obsoletes: %{name}-gimp-devel < 1.5.1.5-1
  124.  
  125. -Provides: %{name}-devel = %{version}-%{release}
  126. -
  127. -%description -n %develname
  128. +%description -n %{develname}
  129. This package contains the development file for gmic.
  130.  
  131. -%files -n %develname
  132. +%files -n %{develname}
  133. +%{_libdir}/lib%{name}.so
  134. %{_includedir}/%{name}.h
  135.  
  136. #------------------------------------------------------
  137.  
  138. %prep
  139. %setup -q
  140. -%patch11 -p1 -b .makefile
  141. -#%patch2 -p1 -b .zartlibs
  142. +%patch0 -p1 -b .makefile
  143.  
  144. sed -i -e "s|@LIB@|%{_lib}|g" src/Makefile
  145.  
  146. @@ -160,13 +148,13 @@
  147. pushd src
  148. %make
  149. popd
  150. +
  151. pushd zart
  152. %qmake_qt4
  153. %make
  154. popd
  155.  
  156. %install
  157. -rm -fr %{buildroot}
  158. pushd src
  159. %makeinstall_std
  160. popd
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!