summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-03-22 11:03:34 -0700
committerJohn L. Whiteman <john.l.whiteman@intel.com>2014-06-20 11:22:27 -0700
commita8cd287a8f4cb0afee02fbd6cbc2433f667bac98 (patch)
treedab084e6e1e77565693af5a6cc3fdc15bd88c010
parent57ba644b68bf3971ada813e259e3e7564e0080ca (diff)
downloadopenssl-a8cd287a8f4cb0afee02fbd6cbc2433f667bac98.tar.gz
openssl-a8cd287a8f4cb0afee02fbd6cbc2433f667bac98.tar.bz2
openssl-a8cd287a8f4cb0afee02fbd6cbc2433f667bac98.zip
Fixed package groups
-rw-r--r--packaging/openssl.changes3
-rw-r--r--packaging/openssl.spec16
2 files changed, 16 insertions, 3 deletions
diff --git a/packaging/openssl.changes b/packaging/openssl.changes
index 08709b4..b66ca4c 100644
--- a/packaging/openssl.changes
+++ b/packaging/openssl.changes
@@ -1,3 +1,6 @@
+* Fri Mar 22 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130318.194800@d92acdb
+- Fixed package groups
+
* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20121228.194701@641e3b2
- Fixed package group
diff --git a/packaging/openssl.spec b/packaging/openssl.spec
index 949c6b8..52d3673 100644
--- a/packaging/openssl.spec
+++ b/packaging/openssl.spec
@@ -67,6 +67,13 @@ Provides: openssl-devel = %{version}
This package contains all necessary include files and libraries needed
to develop applications that require these.
+%package misc
+Summary: Additional data files and scripts for %{name}
+Group: Security/Crypto Libraries
+
+%description misc
+Additional data files and scripts for %{name}.
+
%package doc
Summary: Additional Package Documentation
Group: Security/Crypto Libraries
@@ -199,7 +206,7 @@ for i in man?/*; do
case `basename ${i%.*}` in
asn1parse|ca|config|crl|crl2pkcs7|crypto|dgst|dhparam|dsa|dsaparam|enc|gendsa|genrsa|nseq|openssl|passwd|pkcs12|pkcs7|pkcs8|rand|req|rsa|rsautl|s_client|s_server|smime|spkac|ssl|verify|version|x509)
# these are the pages mentioned in openssl(1). They go into the main package.
- echo %doc %{_mandir}/${i}ssl.gz >> $OLDPWD/filelist;;
+ echo %doc %{_mandir}/${i}ssl.gz >> $OLDPWD/filelist.doc;;
*)
# the rest goes into the openssl-doc package.
echo %doc %{_mandir}/${i}ssl.gz >> $OLDPWD/filelist.doc;;
@@ -289,7 +296,7 @@ cd $RPM_BUILD_DIR
%doc doc/* demos
%doc showciphers.c
-%files -f filelist
+%files
%defattr(-, root, root)
%license LICENSE
%dir %{ssletcdir}
@@ -297,8 +304,11 @@ cd $RPM_BUILD_DIR
%config (noreplace) %{ssletcdir}/openssl.cnf
%attr(700,root,root) %{ssletcdir}/private
%dir %{_datadir}/ssl
+%{_bindir}/%{name}
+
+%files misc
%{_datadir}/ssl/misc
%{_bindir}/c_rehash
-%{_bindir}/%{name}
+
%changelog