rpms/oyranos/devel oyranos.spec,1.6,1.7
NicolasChauvet
kwizart at fedoraproject.org
Mon Mar 9 11:03:55 UTC 2009
- Previous message: comps/po es.po,1.29,1.30
- Next message: rpms/perl-Variable-Magic/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-Variable-Magic.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kwizart
Update of /cvs/pkgs/rpms/oyranos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4941
Modified Files:
oyranos.spec
Log Message:
Fix weirdness in the spec file
Index: oyranos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oyranos.spec 9 Mar 2009 10:26:13 -0000 1.6
+++ oyranos.spec 9 Mar 2009 11:03:25 -0000 1.7
@@ -1,6 +1,6 @@
Name: oyranos
Version: 0.1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Oyranos Colour Management System (CMS)
Group: Applications/Multimedia
@@ -15,7 +15,6 @@
Patch2: oyranos-0.1.9-default.patch
Patch3: oyranos-0.1.9-man-1_3.patch
Patch4: oyranos-0.1.9-rm_class.patch
-Patch5: oyranos-0.1.9-cmms_lf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: OpenEXR-devel
@@ -31,6 +30,7 @@
BuildRequires: libstdc++-devel
BuildRequires: libxslt-devel
BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: libXNVCtrl-devel
@@ -72,6 +72,9 @@
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+# -doc deprecation introducted in F-11
+Provides: %{name}-doc = %{version}-%{release}
+Obsoletes: %{name}-doc < 0.1.9-2
Requires: pkgconfig
Requires: libX11-devel
Requires: libXinerama-devel
@@ -79,12 +82,6 @@
%description devel
This package contains development files for %{name}.
-%package docs
-Summary: Documentation for %{name}
-Group: Documentation
-
-%description docs
-This package contains documentation files for %{name}.
%prep
@@ -94,7 +91,6 @@
%patch2 -p1 -b .default
%patch3 -p1 -b .man-1_3
%patch4 -p1 -b .rm_class
-#patch5 -p1 -b .cmms_lf
# Update Doxygen
doxygen -u
@@ -110,6 +106,8 @@
make
#{?_smp_mflags}
+# Doxygen documentation generated here
+make docu
%install
rm -rf $RPM_BUILD_ROOT __doc
@@ -126,11 +124,13 @@
# Multilib tweaks
touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+touch -r ChangeLog doc/html/*
#Manual install
mkdir -p $RPM_BUILD_ROOT%{_settingscolordir}
install -pm 0644 settings/*.policy.xml $RPM_BUILD_ROOT%{_settingscolordir}
+
%find_lang %{name}
@@ -171,6 +171,7 @@
%files devel
%defattr(-,root,root,-)
+%doc doc/html/*
%{_bindir}/%{name}-config
#{_mandir}/man3/%{name}.*
#{_mandir}/man3/%{name}-config.*
@@ -178,12 +179,14 @@
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}*.pc
-%files docs
-%defattr(-,root,root,-)
-#doc __doc/html/*
%changelog
+* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.1.9-2
+- Remove unused patch
+- Merge -doc in -devel
+- Add missing BR libtiff-devel
+
* Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 0.1.9-1
- Update to 0.1.9
- Previous message: comps/po es.po,1.29,1.30
- Next message: rpms/perl-Variable-Magic/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-Variable-Magic.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list